1 files changed, 5 insertions, 3 deletions
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/DataEntity.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/DataEntity.java
index a96b36a..a081f89 100644
--- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/DataEntity.java
+++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/DataEntity.java
@@ -52,12 +52,14 @@ public class DataEntity {
                 ExceptionCollector.appendWarning(String.format(
                     "TypeMismatchError: \"%s\" is not a map. The type is \"%s\"",
                     value.toString(),dataType.getType()));
-
-				if (value instanceof List)
+                
+				if (value instanceof List && ((List) value).size() > 0)  {
 					value = ((List) value).get(0);
+				}
 
-				if (!(value instanceof LinkedHashMap))
+				if (!(value instanceof LinkedHashMap))  {
 					return value;
+				}
 			}