1 files changed, 4 insertions, 1 deletions
diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/CustomYamlFunction.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/CustomYamlFunction.java
index 84543e29f7..e9d584486d 100644
--- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/CustomYamlFunction.java
+++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/CustomYamlFunction.java
@@ -36,7 +36,10 @@ public class CustomYamlFunction implements ToscaFunction, ToscaFunctionParameter
 
     @Override
     public String getValue() {
-        return new Yaml().dump(yamlValue);
+        if (yamlValue == null) {
+            return null;
+        }
+        return yamlValue instanceof String ? (String) yamlValue : new Yaml().dump(yamlValue);
     }
 
     @Override