1 files changed, 5 insertions, 0 deletions
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/Component.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/Component.java
index e0ca719005..1c0cfc4c5d 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/Component.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/Component.java
@@ -638,6 +638,11 @@ public abstract class Component implements PropertiesOwner {
     }
 
     public void setDerivedFromGenericInfo(Resource genericType) {
+        if (genericType == null) {
+            derivedFromGenericType = null;
+            derivedFromGenericVersion = null;
+            return;
+        }
         derivedFromGenericType = genericType.getToscaResourceName();
         derivedFromGenericVersion = genericType.getVersion();
     }