1 files changed, 7 insertions, 4 deletions
diff --git a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/clldeliveryIntentmgt/clldeliverymodule/CLLDeliveryActuationModule.java b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/clldeliveryIntentmgt/clldeliverymodule/CLLDeliveryActuationModule.java
index c090b4d..592c1b1 100644
--- a/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/clldeliveryIntentmgt/clldeliverymodule/CLLDeliveryActuationModule.java
+++ b/intentanalysis/src/main/java/org/onap/usecaseui/intentanalysis/clldeliveryIntentmgt/clldeliverymodule/CLLDeliveryActuationModule.java
@@ -89,10 +89,13 @@ public class CLLDeliveryActuationModule extends ActuationModule {
             String expectationId = intent.getIntentExpectations().get(0).getExpectationId();
 
             // Get the fulfillmentInfo of the first exception which need to be updated with resultHeader returned
-            FulfillmentInfo fulfillmentInfo = expectationService.getIntentExpectation(expectationId).getExpectationFulfillmentInfo();
-
-            if (fulfillmentInfo == null) {
-                fulfillmentInfo = new FulfillmentInfo();
+            FulfillmentInfo fulfillmentInfo = new FulfillmentInfo();
+            Expectation intentExpectation = expectationService.getIntentExpectation(expectationId);
+            if (intentExpectation != null) {
+                FulfillmentInfo expectationFulfillmentInfo = intentExpectation.getExpectationFulfillmentInfo();
+                if (expectationFulfillmentInfo != null) {
+                    fulfillmentInfo = expectationFulfillmentInfo;
+                }
             }
 
             // Update fulfillmentInfo and write back to DB