From 67edbdd1636c71b1d1ca25e81339d25e8b1b313e Mon Sep 17 00:00:00 2001
From: FrankOHara43 <aryaswaraj5@gmail.com>
Date: Fri, 1 May 2026 19:11:44 +0530
Subject: [PATCH] fix(BeneficiaryRegistrationController): added checks for null
 to prevent NPE

Signed-off-by: FrankOHara43 <aryaswaraj5@gmail.com>
---
 .../beneficiary/BeneficiaryRegistrationController.java   | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/iemr/common/controller/beneficiary/BeneficiaryRegistrationController.java b/src/main/java/com/iemr/common/controller/beneficiary/BeneficiaryRegistrationController.java
index 67f57981..589069fd 100644
--- a/src/main/java/com/iemr/common/controller/beneficiary/BeneficiaryRegistrationController.java
+++ b/src/main/java/com/iemr/common/controller/beneficiary/BeneficiaryRegistrationController.java
@@ -664,9 +664,16 @@ public String getBeneficiaryIDs(
 	}
 
 	private void setBeneficiaryGender(List<BeneficiaryModel> iBeneficiary) {
+		if (iBeneficiary == null || iBeneficiary.isEmpty()) {
+			return;
+		}
 		for (BeneficiaryModel beneficiaryModel : iBeneficiary) {
-			if (null != beneficiaryModel.getM_gender() && beneficiaryModel.getM_gender().getGenderName() != null)
+			if (beneficiaryModel == null) {
+				continue;
+			}
+			if (beneficiaryModel.getM_gender() != null && beneficiaryModel.getM_gender().getGenderName() != null) {
 				beneficiaryModel.setGenderName(beneficiaryModel.getM_gender().getGenderName());
+			}
 		}
 
 	}