diff --git a/src/main/java/com/iemr/common/controller/abdmfacility/AbdmFacilityController.java b/src/main/java/com/iemr/common/controller/abdmfacility/AbdmFacilityController.java
index 1aa28712..dc0b8e13 100644
--- a/src/main/java/com/iemr/common/controller/abdmfacility/AbdmFacilityController.java
+++ b/src/main/java/com/iemr/common/controller/abdmfacility/AbdmFacilityController.java
@@ -31,13 +31,12 @@ public String getAbdmFacilityDetails(@PathVariable int workLocationId, @RequestH
 		OutputResponse response = new OutputResponse();
 
 		try {
-
 			String resp = abdmFacilityService.getMappedAbdmFacility(workLocationId);
-
+			if (resp != null)
 				response.setResponse(resp);
-
+			else
+				response.setResponse("No ABDM facility mapped for this worklocation");
 		} catch (Exception e) {
-
 			response.setError(5000, e.getMessage());
 			logger.error(e.getMessage());
 		}
diff --git a/src/main/java/com/iemr/common/service/abdmfacility/AbdmFacilityServiceImpl.java b/src/main/java/com/iemr/common/service/abdmfacility/AbdmFacilityServiceImpl.java
index e6da2522..f6d5ff17 100644
--- a/src/main/java/com/iemr/common/service/abdmfacility/AbdmFacilityServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/abdmfacility/AbdmFacilityServiceImpl.java
@@ -15,8 +15,9 @@ public class AbdmFacilityServiceImpl implements AbdmFacilityService{
 	@Override
 	public String getMappedAbdmFacility(int psmId) {
 		ProviderServiceAddressMapping res = abdmFacilityRepo.getAbdmFacility(psmId);
+		if (res == null)
+			return null;
 		return res.toString();
-		
 	}
 
 }