diff --git a/src/main/java/com/wipro/fhir/service/ndhm/LinkCareContext_NDHMServiceImpl.java b/src/main/java/com/wipro/fhir/service/ndhm/LinkCareContext_NDHMServiceImpl.java
index 86ceeec..f20f083 100644
--- a/src/main/java/com/wipro/fhir/service/ndhm/LinkCareContext_NDHMServiceImpl.java
+++ b/src/main/java/com/wipro/fhir/service/ndhm/LinkCareContext_NDHMServiceImpl.java
@@ -119,6 +119,7 @@ public String generateOTPForCareContext(String request) throws FHIRException {
 				HttpHeaders headers = common_NDHMService.getHeaders(ndhmAuthToken, abhaMode);
 			ResponseEntity<String> responseEntity = httpUtils.postWithResponseEntity(generateOTPForCareContext,
 					requestOBJ, headers);
+			logger.info("NDHM_FHIR Carecontext generateOTP API response - " + responseEntity);
 			String responseStrLogin = common_NDHMService.getStatusCode(responseEntity);
 			String numericStatusCodeStr = responseStrLogin.split(" ")[0]; // Extracts "202" from "202 ACCEPTED"
 			int numericStatusCode = Integer.parseInt(numericStatusCodeStr);
diff --git a/src/main/java/com/wipro/fhir/service/v3/careContext/CareContextLinkingServiceImpl.java b/src/main/java/com/wipro/fhir/service/v3/careContext/CareContextLinkingServiceImpl.java
index d8a6382..c899bae 100644
--- a/src/main/java/com/wipro/fhir/service/v3/careContext/CareContextLinkingServiceImpl.java
+++ b/src/main/java/com/wipro/fhir/service/v3/careContext/CareContextLinkingServiceImpl.java
@@ -85,6 +85,7 @@ public String generateTokenForCareContext(String request) throws FHIRException {
 		String linkToken = null;
 		Map<String, String> responseMap = new HashMap<>();
 		RestTemplate restTemplate = new RestTemplate();
+		String linkExists = null;
 
 		try {
 			String abhaAuthToken = generateAuthSessionService.getAbhaAuthToken();
@@ -92,7 +93,9 @@ public String generateTokenForCareContext(String request) throws FHIRException {
 					CareContextLinkTokenRequest.class);
 
 			if (null != careContextLinkRequest.getAbhaAddress()) {
-				String linkExists = checkRecordExisits(careContextLinkRequest.getAbhaAddress());
+				linkExists = checkRecordExisits(careContextLinkRequest.getAbhaAddress());
+			}
+			if(linkExists != null) {
 				responseMap.put("linkToken", linkExists);
 			} else {