1 files changed, 6 insertions, 4 deletions
diff --git a/src/main/java/org/onap/nbi/apis/hub/service/EventFactory.java b/src/main/java/org/onap/nbi/apis/hub/service/EventFactory.java
index b2a017c..3e04b84 100644
--- a/src/main/java/org/onap/nbi/apis/hub/service/EventFactory.java
+++ b/src/main/java/org/onap/nbi/apis/hub/service/EventFactory.java
@@ -59,13 +59,15 @@ public class EventFactory {
      */
     private static Object filterServiceOrder(final ServiceOrder serviceOrder) {
 
-        Object filteredServiceOrder;
+        Object filteredServiceOrder = null;
 
-        JsonRepresentation jsonRepresentation = new JsonRepresentation();
-        jsonRepresentation.add("id").add("href").add("externalId").add("state").add("orderDate").add
+        if (serviceOrder != null) {
+            JsonRepresentation jsonRepresentation = new JsonRepresentation();
+            jsonRepresentation.add("id").add("href").add("externalId").add("state").add("orderDate").add
                 ("completionDateTime").add("orderItem");
 
-        filteredServiceOrder = JacksonFilter.createNode(serviceOrder, jsonRepresentation);
+            filteredServiceOrder = JacksonFilter.createNode(serviceOrder, jsonRepresentation);
+        }
 
         return filteredServiceOrder;
     }