diff --git a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java
index 8bd8aac..5f6cb31 100644
--- a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java
+++ b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java
@@ -319,7 +319,7 @@
 
         if (TYPE_LIST.equalsIgnoreCase(type)) {
             property.addProperty(TYPE, "array");
-            if (cdsProperty.get(PROPERTIES) != null) {
+            if (cdsProperty != null && cdsProperty.get(PROPERTIES) != null) {
                 JsonObject dataObject = new JsonObject();
                 addDataFields(cdsProperty.get(PROPERTIES).getAsJsonObject(),
                               dataObject);
diff --git a/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js b/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js
index 538688d..54ac641 100644
--- a/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js
+++ b/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js
@@ -87,11 +87,13 @@
 	const {onChange} = props;
 	const subDicts = [];
 	subDicts.push('Default');
-	for(var item in dictList) {
-		if(dictList[item].secondLevelDictionary === 1) {
-			subDicts.push(dictList[item].name);
-		}
-	};
+	if (dictList != "undefined"  && dictList.length > 0) {
+        for(var item in dictList) {
+            if(dictList[item].secondLevelDictionary === 1) {
+                subDicts.push(dictList[item].name);
+            }
+        };
+	}
 	subDicts.push('');
  	var optionItems = subDicts.map(
 		(item) => <option key={item}>{item}</option>