1 files changed, 6 insertions, 4 deletions
diff --git a/common/src/main/java/org/onap/so/client/aai/AAIValidatorImpl.java b/common/src/main/java/org/onap/so/client/aai/AAIValidatorImpl.java
index 95ed01ee94..96844ff1cb 100644
--- a/common/src/main/java/org/onap/so/client/aai/AAIValidatorImpl.java
+++ b/common/src/main/java/org/onap/so/client/aai/AAIValidatorImpl.java
@@ -47,10 +47,12 @@ public class AAIValidatorImpl implements AAIValidator {
         List<Pserver> pservers;
         boolean isLocked = false;
         pservers = client.getPhysicalServerByVnfId(vnfId);
-        for (Pserver pserver : pservers) {
-            if (pserver.isInMaint()) {
-                isLocked = true;
-                return isLocked;
+        if (pservers != null) {
+            for (Pserver pserver : pservers) {
+                if (pserver.isInMaint()) {
+                    isLocked = true;
+                    return isLocked;
+                }
             }
         }
         return isLocked;