X-Git-Url: https://gerrit.onap.org/r/gitweb?p=sdc.git;a=blobdiff_plain;f=catalog-be%2Fsrc%2Fmain%2Fjava%2Forg%2Fopenecomp%2Fsdc%2Fbe%2Ftosca%2FCommonCsarGenerator.java;h=0e3328f4d8fb7a1439deaaa0c62a128769de815e;hp=d5c64db76b193df204086afb7ae7385b402ec65f;hb=6b58f89d940d56bfda38b5f86ef5a86ee29f80cf;hpb=133d8bbc63891a9c169b002c03be9ec27f8bc486

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CommonCsarGenerator.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CommonCsarGenerator.java
index d5c64db76b..0e3328f4d8 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CommonCsarGenerator.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CommonCsarGenerator.java
@@ -748,7 +748,7 @@ public class CommonCsarGenerator {
 
     private Object getValue(final String key, Map<String, Object> value) {
         final String mappedKey = mapKey(key);
-        if (mappedKey.equals("schemaType")) {
+        if (mappedKey.equals("schemaType") && value.get(mappedKey) != null) {
             return Collections.singletonMap("type", value.get(mappedKey));
         }
         return value.get(mappedKey);