1 files changed, 7 insertions, 0 deletions
diff --git a/framework/src/main/java/org/onap/cli/fw/schema/OnapCommandSchemaInfo.java b/framework/src/main/java/org/onap/cli/fw/schema/OnapCommandSchemaInfo.java
index 2cd9458a..d4776e16 100644
--- a/framework/src/main/java/org/onap/cli/fw/schema/OnapCommandSchemaInfo.java
+++ b/framework/src/main/java/org/onap/cli/fw/schema/OnapCommandSchemaInfo.java
@@ -145,6 +145,13 @@ public class OnapCommandSchemaInfo implements Comparable<OnapCommandSchemaInfo>
 
     @Override
     public boolean equals(Object obj) {
+        if (obj == null)
+            return false;
+
+        if (this.getClass() != obj.getClass())
+            return false;
+
         return this.compareTo((OnapCommandSchemaInfo) obj) == 0;
     }
+
 }