1 files changed, 7 insertions, 2 deletions
diff --git a/src/main/java/org/onap/nbi/apis/servicecatalog/ServiceSpecificationService.java b/src/main/java/org/onap/nbi/apis/servicecatalog/ServiceSpecificationService.java
index e89960a..f34f965 100644
--- a/src/main/java/org/onap/nbi/apis/servicecatalog/ServiceSpecificationService.java
+++ b/src/main/java/org/onap/nbi/apis/servicecatalog/ServiceSpecificationService.java
@@ -15,8 +15,10 @@
  */
 package org.onap.nbi.apis.servicecatalog;
 
+import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
+import org.apache.commons.collections.CollectionUtils;
 import org.onap.nbi.apis.servicecatalog.jolt.FindServiceSpecJsonTransformer;
 import org.onap.nbi.apis.servicecatalog.jolt.GetServiceSpecJsonTransformer;
 import org.slf4j.Logger;
@@ -59,8 +61,11 @@ public class ServiceSpecificationService {
 
     public List<LinkedHashMap> find(MultiValueMap<String, String> parametersMap) {
         List<LinkedHashMap> sdcResponse = sdcClient.callFind(parametersMap);
-        List<LinkedHashMap> serviceCatalogResponse =
-                (List<LinkedHashMap>) findServiceSpecJsonTransformer.transform(sdcResponse);
+        List<LinkedHashMap> serviceCatalogResponse = new ArrayList<>();
+        if(CollectionUtils.isNotEmpty(sdcResponse)){
+            serviceCatalogResponse =
+                findServiceSpecJsonTransformer.transform(sdcResponse);
+        }
         return serviceCatalogResponse;
     }
 }