1 files changed, 12 insertions, 3 deletions

diff --git a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/Configuration.java b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/Configuration.java
index 8bdbb1a8..91a07d4f 100644
--- a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/Configuration.java
+++ b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/Configuration.java
@@ -260,9 +260,18 @@ public class Configuration {
 		 minPercentageChange = jsonObject.get("sliceanalysisms.minPercentageChange").getAsInt();
 		 initialDelaySeconds = jsonObject.get("sliceanalysisms.initialDelaySeconds").getAsLong();
 
-		 aafUsername = jsonObject.get("aafUsername").getAsString();
-		 aafPassword = jsonObject.get("aafPassword").getAsString();
-		 
+		 if(jsonObject.get("aafUsername") == null) {
+			 aafUsername = null;
+		 }
+		 else {
+			 aafUsername = jsonObject.get("aafUsername").getAsString();
+		 }
+		 if(jsonObject.get("aafPassword") == null) {
+			 aafPassword = null;
+		 }
+		 else {
+			 aafPassword = jsonObject.get("aafPassword").getAsString();
+		 }		 
 		 log.info("configuration from CBS {}", this);
 	 }
 }