1 files changed, 12 insertions, 7 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceImportParseLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceImportParseLogic.java
index 65576d1567..935a5d6796 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceImportParseLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceImportParseLogic.java
@@ -2198,13 +2198,18 @@ public class ServiceImportParseLogic {
     }
 
     public void associateComponentInstancePropertiesToComponent(String yamlName, Resource resource, Map<String, List<ComponentInstanceProperty>> instProperties) {
-        Either<Map<String, List<ComponentInstanceProperty>>, StorageOperationStatus> addPropToInst = toscaOperationFacade
-                .associateComponentInstancePropertiesToComponent(instProperties, resource.getUniqueId());
-        if (addPropToInst.isRight()) {
-            log.debug("failed to associate properties of resource {} status is {}", resource.getUniqueId(),
-                    addPropToInst.right().value());
-            throw new ComponentException(componentsUtils.getResponseFormat(
-                    componentsUtils.convertFromStorageResponse(addPropToInst.right().value()), yamlName));
+        try {
+            Either<Map<String, List<ComponentInstanceProperty>>, StorageOperationStatus> addPropToInst = toscaOperationFacade
+                    .associateComponentInstancePropertiesToComponent(instProperties, resource.getUniqueId());
+            if (addPropToInst.isRight()) {
+                log.debug("failed to associate properties of resource {} status is {}", resource.getUniqueId(),
+                        addPropToInst.right().value());
+                throw new ComponentException(componentsUtils.getResponseFormat(
+                        componentsUtils.convertFromStorageResponse(addPropToInst.right().value()), yamlName));
+            }
+        } catch (Exception e) {
+            log.debug("Exception occured when findNodeTypeArtifactsToHandle, error is:{}", e.getMessage());
+            throw new ComponentException(ActionStatus.GENERAL_ERROR);
         }
     }