1 files changed, 9 insertions, 7 deletions
diff --git a/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/service/aai/AaiResponseParser.java b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/service/aai/AaiResponseParser.java
index 0b300c4..114b776 100644
--- a/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/service/aai/AaiResponseParser.java
+++ b/so-cnf-adapter-application/src/main/java/org/onap/so/adapters/cnf/service/aai/AaiResponseParser.java
@@ -89,13 +89,15 @@ public class AaiResponseParser {
 
     private List<String> parseLabels(Map<String, String> labels) {
         List<String> result = new ArrayList<>();
-        labels.entrySet().stream()
-                .filter(i -> i.getKey().equals(INSTANCE_ID))
-                .findFirst()
-                .ifPresent(i -> addLabelEntry(i, result));
-        labels.entrySet().stream()
-                .filter(i -> !i.getKey().equals(INSTANCE_ID))
-                .forEach(i -> addLabelEntry(i, result));
+        if (labels != null) {
+            labels.entrySet().stream()
+                    .filter(i -> i.getKey().equals(INSTANCE_ID))
+                    .findFirst()
+                    .ifPresent(i -> addLabelEntry(i, result));
+            labels.entrySet().stream()
+                    .filter(i -> !i.getKey().equals(INSTANCE_ID))
+                    .forEach(i -> addLabelEntry(i, result));
+        }
         return result;
     }