diff --git a/src/main/java/com/iemr/common/identity/service/IdentityService.java b/src/main/java/com/iemr/common/identity/service/IdentityService.java
index 95df5a0..6e8a71e 100644
--- a/src/main/java/com/iemr/common/identity/service/IdentityService.java
+++ b/src/main/java/com/iemr/common/identity/service/IdentityService.java
@@ -884,21 +884,27 @@ private MBeneficiarymapping getBeneficiariesDTONew(Object[] benMapArr) {
             //benMapOBJ = mappingRepo.getMapping(getBigIntegerValueFromObject(benMapArr[9]), (Integer) benMapArr[8]);
 
             BigInteger benRegId = new BigInteger(benMapArr[5].toString());
-            RMNCHBeneficiaryDetailsRmnch obj = rMNCHBeneficiaryDetailsRmnchRepo
-                    .getByRegID(benRegId).get(0);
-
-            if (obj != null) {
-                if (obj.getHouseoldId() != null) {
-                    mapping.setHouseHoldID(obj.getHouseoldId());
-                }
-                if (obj.getGuidelineId() != null) {
-                    mapping.setGuideLineID(obj.getGuidelineId());
-                }
-                if (obj.getRchid() != null) {
-                    mapping.setRchID(obj.getRchid());
+            if(!rMNCHBeneficiaryDetailsRmnchRepo
+                    .getByRegID(benRegId).isEmpty()){
+                RMNCHBeneficiaryDetailsRmnch obj = rMNCHBeneficiaryDetailsRmnchRepo
+                        .getByRegID(benRegId).get(0);
+
+                if (obj != null) {
+                    if (obj.getHouseoldId() != null) {
+                        mapping.setHouseHoldID(obj.getHouseoldId());
+                    }
+                    if (obj.getGuidelineId() != null) {
+                        mapping.setGuideLineID(obj.getGuidelineId());
+                    }
+                    if (obj.getRchid() != null) {
+                        mapping.setRchID(obj.getRchid());
+                    }
                 }
             }
 
+
+
+
         }
         return mapping;
     }
diff --git a/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java b/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java
index df24e58..568d4c1 100644
--- a/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java
+++ b/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java
@@ -144,12 +144,17 @@ public String syncDataToAmrit(String requestOBJ) throws Exception {
 							for (RMNCHBeneficiaryDetailsRmnch obj : benDetailsExtraList) {
 								benRegID = rMNCHMBenRegIdMapRepo.getRegID(obj.getBenficieryid());
 								obj.setBenRegId(benRegID);
-								RMNCHBeneficiaryDetailsRmnch temp = rMNCHBeneficiaryDetailsRmnchRepo
-										.getByRegID(benRegID).get(0);
-								if (temp != null) {
-									obj.setBeneficiaryDetails_RmnchId(temp.getBeneficiaryDetails_RmnchId());
+								if(!rMNCHBeneficiaryDetailsRmnchRepo
+										.getByRegID(benRegID).isEmpty()){
+									RMNCHBeneficiaryDetailsRmnch temp = rMNCHBeneficiaryDetailsRmnchRepo
+											.getByRegID(benRegID).get(0);
+									if (temp != null) {
+										obj.setBeneficiaryDetails_RmnchId(temp.getBeneficiaryDetails_RmnchId());
+									}
 								}
 
+
+
 								if (obj.getRelatedBeneficiaryIds() != null
 										&& obj.getRelatedBeneficiaryIds().length > 0) {
 									StringBuffer sb = new StringBuffer();
@@ -404,8 +409,12 @@ private String getMappingsForAddressIDs(List<RMNCHMBeneficiaryaddress> addressLi
 						benID = rMNCHMBenRegIdMapRepo.getBenIdFromRegID(m.getBenRegId().longValue());
 
 					if (m.getBenRegId() != null) {
-						benDetailsRMNCHOBJ = rMNCHBeneficiaryDetailsRmnchRepo
-								.getByRegID(m.getBenRegId()).get(0);
+						if(!rMNCHBeneficiaryDetailsRmnchRepo
+								.getByRegID(m.getBenRegId()).isEmpty()){
+							benDetailsRMNCHOBJ = rMNCHBeneficiaryDetailsRmnchRepo
+									.getByRegID(m.getBenRegId()).get(0);
+						}
+
 						benBotnBirthRMNCHROBJ = rMNCHBornBirthDetailsRepo.getByRegID(m.getBenRegId());
 
 						benCABCRMNCHROBJ = rMNCHCBACDetailsRepo.getByRegID(m.getBenRegId());