1 files changed, 2 insertions, 0 deletions

diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/ConfigApiController.java b/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/ConfigApiController.java
index e3d084e..16db766 100644
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/ConfigApiController.java
+++ b/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/ConfigApiController.java
@@ -403,6 +403,7 @@ public class ConfigApiController implements ConfigApi {
         for (ConfigServices service : configServicesRepository.findAll()) {
             GenericResourceApiServicemodelinfrastructureService serviceItem = new GenericResourceApiServicemodelinfrastructureService();
             serviceItem.setServiceInstanceId(service.getSvcInstanceId());
+            if (service.getSvcData() != null) {
             try {
                 serviceItem.setServiceData(objectMapper.readValue(service.getSvcData(), GenericResourceApiServicedataServiceData.class));
             } catch (JsonProcessingException e) {
@@ -410,6 +411,7 @@ public class ConfigApiController implements ConfigApi {
                 throw new RestApplicationException("data-conversion", "Request could not be completed due to internal error", e, HttpStatus.INTERNAL_SERVER_ERROR.value());
 
             }
+        }
             serviceItem.setServiceStatus(service.getServiceStatus());
             modelInfrastructure.addServiceItem(serviceItem);
         }