1 files changed, 4 insertions, 1 deletions
diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ToscaFunctionJsonDeserializer.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ToscaFunctionJsonDeserializer.java
index 363af1cdeb..c262699cc2 100644
--- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ToscaFunctionJsonDeserializer.java
+++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ToscaFunctionJsonDeserializer.java
@@ -146,8 +146,11 @@ public class ToscaFunctionJsonDeserializer extends StdDeserializer<ToscaFunction
         final var toscaConcatFunction = new ToscaConcatFunction();
         final List<ToscaFunctionParameter> functionParameterList = new ArrayList<>();
         final JsonNode parametersNode = concatFunctionJsonNode.get("parameters");
+        if (parametersNode == null) {
+            return toscaConcatFunction;
+        }
         if (!parametersNode.isArray()) {
-            throw context.instantiationException(List.class, "");
+            throw context.instantiationException(List.class, "Expecting an array for the 'parameters' entry");
         }
         for (final JsonNode parameterNode : parametersNode) {
             final JsonNode typeJsonNode = parameterNode.get("type");