diff --git a/incubator/net/src/main/java/org/onosproject/incubator/net/resource/label/impl/LabelResourceManager.java b/incubator/net/src/main/java/org/onosproject/incubator/net/resource/label/impl/LabelResourceManager.java
index fecba11..56167c4 100644
--- a/incubator/net/src/main/java/org/onosproject/incubator/net/resource/label/impl/LabelResourceManager.java
+++ b/incubator/net/src/main/java/org/onosproject/incubator/net/resource/label/impl/LabelResourceManager.java
@@ -80,11 +80,11 @@
                                     LabelResourceId endLabel) {
         checkNotNull(deviceId, "deviceId is not null");
         checkNotNull(beginLabel, "beginLabel is not null");
-        checkNotNull(endLabel, "beginLabel is not null");
+        checkNotNull(endLabel, "endLabel is not null");
         checkArgument(beginLabel.labelId() >= 0 || endLabel.labelId() >= 0,
                       "The value of beginLabel and the value of endLabel must be both positive number.");
-        checkArgument(beginLabel.labelId() <= endLabel.labelId(),
-                      "The value of endLabel must be greater than the value of endLabel.");
+        checkArgument(beginLabel.labelId() < endLabel.labelId(),
+                      "The value of endLabel must be greater than the value of beginLabel.");
         return store.createDevicePool(deviceId, beginLabel, endLabel);
     }
 
@@ -92,11 +92,11 @@
     public boolean createGlobalPool(LabelResourceId beginLabel,
                                     LabelResourceId endLabel) {
         checkNotNull(beginLabel, "beginLabel is not null");
-        checkNotNull(endLabel, "beginLabel is not null");
+        checkNotNull(endLabel, "endLabel is not null");
         checkArgument(beginLabel.labelId() >= 0 && endLabel.labelId() >= 0,
                       "The value of beginLabel and the value of endLabel must be both positive number.");
-        checkArgument(beginLabel.labelId() <= endLabel.labelId(),
-                      "The value of endLabel must be greater than the value of endLabel.");
+        checkArgument(beginLabel.labelId() < endLabel.labelId(),
+                      "The value of endLabel must be greater than the value of beginLabel.");
         return store.createGlobalPool(beginLabel, endLabel);
     }
 
