1 files changed, 7 insertions, 5 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/src/main/java/org/openecomp/sdc/generator/datatypes/tosca/LicenseFlavor.java b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/src/main/java/org/openecomp/sdc/generator/datatypes/tosca/LicenseFlavor.java
index f459d9e993..1cdeaca562 100644
--- a/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/src/main/java/org/openecomp/sdc/generator/datatypes/tosca/LicenseFlavor.java
+++ b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/src/main/java/org/openecomp/sdc/generator/datatypes/tosca/LicenseFlavor.java
@@ -24,14 +24,16 @@ public class LicenseFlavor {
   public boolean equals(Object obj) {
     if (this == obj)
       return true;
-    if (getClass() != obj.getClass())
+    if (obj != null && getClass() != obj.getClass())
       return false;
     LicenseFlavor other = (LicenseFlavor) obj;
-    if (this.feature_group_uuid == null) {
-      if (other.feature_group_uuid != null)
+    if (other != null) {
+      if (this.feature_group_uuid == null) {
+        if (other.feature_group_uuid != null)
+          return false;
+      } else if (!feature_group_uuid.equals(other.feature_group_uuid))
         return false;
-    } else if (!feature_group_uuid.equals(other.feature_group_uuid))
-      return false;
+    }
     return true;
   }