1 files changed, 5 insertions, 2 deletions
diff --git a/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/acm/participant/policy/main/handler/AutomationCompositionElementHandler.java b/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/acm/participant/policy/main/handler/AutomationCompositionElementHandler.java
index 627f79131..5eb997e52 100644
--- a/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/acm/participant/policy/main/handler/AutomationCompositionElementHandler.java
+++ b/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/acm/participant/policy/main/handler/AutomationCompositionElementHandler.java
@@ -154,7 +154,9 @@ public class AutomationCompositionElementHandler implements AutomationCompositio
 
         var automationCompositionDefinition = element.getToscaServiceTemplateFragment();
         if (automationCompositionDefinition.getToscaTopologyTemplate() == null) {
-            throw new PfModelException(Status.BAD_REQUEST, "ToscaTopologyTemplate not defined");
+            intermediaryApi.updateAutomationCompositionElementState(automationCompositionId, element.getId(),
+                    DeployState.UNDEPLOYED, null, "ToscaTopologyTemplate not defined");
+            return;
         }
         serviceTemplateMap.put(element.getId(), automationCompositionDefinition);
         if (automationCompositionDefinition.getPolicyTypes() != null) {
@@ -174,7 +176,8 @@ public class AutomationCompositionElementHandler implements AutomationCompositio
             var policyList = getPolicyList(automationCompositionDefinition);
             deployPolicies(policyList, automationCompositionId, element.getId());
         } else {
-            throw new PfModelException(Status.BAD_REQUEST,
+            intermediaryApi.updateAutomationCompositionElementState(automationCompositionId, element.getId(),
+                    DeployState.UNDEPLOYED, null,
                     "Creation of PolicyTypes/Policies failed. Policies will not be deployed.");
         }
     }