1 files changed, 7 insertions, 2 deletions
diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/converter/impl/pnfd/parser/ConversionQueryYamlParser.java b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/converter/impl/pnfd/parser/ConversionQueryYamlParser.java
index 417262c61c..374bf3702f 100644
--- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/converter/impl/pnfd/parser/ConversionQueryYamlParser.java
+++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/converter/impl/pnfd/parser/ConversionQueryYamlParser.java
@@ -19,6 +19,7 @@
 
 package org.openecomp.core.converter.impl.pnfd.parser;
 
+import java.util.Optional;
 import org.openecomp.core.converter.pnfd.model.ConversionQuery;
 
 /**
@@ -36,7 +37,11 @@ public class ConversionQueryYamlParser {
      * @return
      *  A new instance of {@link ConversionQuery}.
      */
-    public static ConversionQuery parse(final Object conversionYaml) {
-        return new ConversionQuery(conversionYaml);
+    public static Optional<ConversionQuery> parse(final Object conversionYaml) {
+        if (conversionYaml == null) {
+            return Optional.empty();
+        }
+
+        return Optional.of(new ConversionQuery(conversionYaml));
     }
 }