1 files changed, 3 insertions, 0 deletions
diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/FilterKeyEnum.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/FilterKeyEnum.java
index 38d297a893..f9bb92eade 100644
--- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/FilterKeyEnum.java
+++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/FilterKeyEnum.java
@@ -42,6 +42,9 @@ public enum FilterKeyEnum {
 	}
 
 	public static List<String> getValidFiltersByAssetType(ComponentTypeEnum assetType) {
+		if(assetType == null) {
+			return null;
+		}
 		switch (assetType) {
 		case RESOURCE:
 			return getAllFilters().subList(0, 3);