1 files changed, 2 insertions, 2 deletions
diff --git a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/cloud/CloudIdentity.java b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/cloud/CloudIdentity.java
index db6ccde46c..0f15dea577 100644
--- a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/cloud/CloudIdentity.java
+++ b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/cloud/CloudIdentity.java
@@ -270,9 +270,9 @@ public class CloudIdentity {
                      .append (", tenantMetadata=")
                      .append (tenantMetadata)
                      .append (", identityServerType=")
-                     .append (identityServerType.toString())
+                     .append (identityServerType == null ? "null" : identityServerType.toString())
                      .append (", identityAuthenticationType=")
-                     .append (identityAuthenticationType.toString());
+                     .append (identityAuthenticationType == null ? "null" : identityAuthenticationType.toString());
         
         return stringBuilder.toString ();
     }