1 files changed, 20 insertions, 19 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/heatresource/NovaServerResourceValidator.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/heatresource/NovaServerResourceValidator.java
index 5dc42c9b9a..d05f2813ff 100644
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/heatresource/NovaServerResourceValidator.java
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/heatresource/NovaServerResourceValidator.java
@@ -90,25 +90,26 @@ public class NovaServerResourceValidator implements ResourceValidator {
       return;
     }
 
-    for (Object serverGroupValue : schedulerHintsMap.values()) {
-      if(!(serverGroupValue instanceof Map)){
-        continue;
-      }
-      Map<String, Object> currentServerMap = (Map<String, Object>) serverGroupValue;
-      String serverResourceName =
-          currentServerMap == null ? null : (String) currentServerMap
-              .get(ResourceReferenceFunctions.GET_RESOURCE.getFunction());
-      Resource serverResource =
-          serverResourceName == null || resourcesMap == null ? null
-              : resourcesMap.get(serverResourceName);
-
-      if (serverResource != null && !serverResource.getType()
-          .equals(HeatResourcesTypes.NOVA_SERVER_GROUP_RESOURCE_TYPE.getHeatResource())) {
-        globalContext.addMessage(fileName, ErrorLevel.ERROR, ErrorMessagesFormatBuilder
-                .getErrorWithParameters(Messages.SERVER_NOT_DEFINED_FROM_NOVA.getErrorMessage(),
-                    serverResourceName, resourceEntry.getKey()),
-            LoggerTragetServiceName.VALIDATE_SERVER_GROUP_EXISTENCE,
-            LoggerErrorDescription.SERVER_NOT_DEFINED_NOVA);
+    if (schedulerHintsMap != null) {
+      for (Object serverGroupValue : schedulerHintsMap.values()) {
+        if (!(serverGroupValue instanceof Map)) {
+          continue;
+        }
+        Map<String, Object> currentServerMap = (Map<String, Object>) serverGroupValue;
+        String serverResourceName = (String) currentServerMap
+                .get(ResourceReferenceFunctions.GET_RESOURCE.getFunction());
+        Resource serverResource =
+            serverResourceName == null || resourcesMap == null ? null
+                : resourcesMap.get(serverResourceName);
+
+        if (serverResource != null && !serverResource.getType()
+            .equals(HeatResourcesTypes.NOVA_SERVER_GROUP_RESOURCE_TYPE.getHeatResource())) {
+          globalContext.addMessage(fileName, ErrorLevel.ERROR, ErrorMessagesFormatBuilder
+                  .getErrorWithParameters(Messages.SERVER_NOT_DEFINED_FROM_NOVA.getErrorMessage(),
+                      serverResourceName, resourceEntry.getKey()),
+              LoggerTragetServiceName.VALIDATE_SERVER_GROUP_EXISTENCE,
+              LoggerErrorDescription.SERVER_NOT_DEFINED_NOVA);
+        }
       }
     }