diff --git a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
index b168c7bd115..e117042fb33 100755
--- a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
+++ b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
@@ -601,7 +601,10 @@ public class SecurityGroupManagerImpl implements SecurityGroupManager, SecurityG
                 throw new InvalidParameterValueException("Invalid ICMP type/code specified, icmpType = " + icmpType + ", icmpCode = " + icmpCode);
             }
             if (icmpType == -1 && icmpCode != -1) {
-                throw new InvalidParameterValueException("Invalid icmp type range");
+                throw new InvalidParameterValueException("Invalid icmp code");
+            }
+            if (icmpType != -1 && icmpCode == -1) {
+                throw new InvalidParameterValueException("Invalid icmp code: need not negative icmp code ");
             }
             if (icmpCode > 255 || icmpType > 255 || icmpCode < -1 || icmpType < -1) {
                 throw new InvalidParameterValueException("Invalid icmp type/code ");