1 files changed, 2 insertions, 1 deletions
diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/AaiClient.java b/vid-app-common/src/main/java/org/onap/vid/aai/AaiClient.java
index 8e47bbae5..c43779df1 100644
--- a/vid-app-common/src/main/java/org/onap/vid/aai/AaiClient.java
+++ b/vid-app-common/src/main/java/org/onap/vid/aai/AaiClient.java
@@ -440,6 +440,8 @@ public class AaiClient implements AaiClientInterface {
     }
 
     protected Stream<ModelVer> toModelVerStream(ModelVersions modelVersions) {
+        if (modelVersions == null)
+            return null;
 
         if (modelVersions == null)
             return null;
@@ -454,7 +456,6 @@ public class AaiClient implements AaiClientInterface {
     }
 
     protected ModelVer maxModelVer(Stream<ModelVer> modelVerStream) {
-
         if (modelVerStream == null)
             return null;