1 files changed, 6 insertions, 1 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/HeatValidator.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/HeatValidator.java
index 0c4371439b..d35a4842d3 100644
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/HeatValidator.java
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/HeatValidator.java
@@ -332,7 +332,12 @@ public class HeatValidator implements Validator {
   private static String getResourceTypeFromResourcesMap(String resourceName,
                                                         HeatOrchestrationTemplate
                                                             heatOrchestrationTemplate) {
-    return heatOrchestrationTemplate.getResources().get(resourceName).getType();
+      Resource resource = heatOrchestrationTemplate.getResources().get(resourceName);
+      if (Objects.nonNull(resource)) {
+          return resource.getType();
+      } else {
+          return null;
+      }
   }
 
   /* validation 17 + */