diff --git a/src/main/java/com/iemr/common/service/beneficiary/IdentityBeneficiaryServiceImpl.java b/src/main/java/com/iemr/common/service/beneficiary/IdentityBeneficiaryServiceImpl.java
index 6fe48620..697322c6 100644
--- a/src/main/java/com/iemr/common/service/beneficiary/IdentityBeneficiaryServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/beneficiary/IdentityBeneficiaryServiceImpl.java
@@ -30,6 +30,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
+import com.google.gson.Gson;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
diff --git a/src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryServiceImpl.java b/src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryServiceImpl.java
index e591d1f6..5a3cec87 100644
--- a/src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryServiceImpl.java
@@ -114,8 +114,10 @@ public Integer updateBenificiary(BeneficiaryModel benificiaryDetails, String aut
 		Integer updatedRows = 0;
 
 		IdentityEditDTO identityEditDTO = identityBenEditMapper.BenToIdentityEditMapper(benificiaryDetails);
-		if(null != benificiaryDetails.getI_bendemographics())
+		if(null != benificiaryDetails.getI_bendemographics()) {
 			identityEditDTO.setCommunity(benificiaryDetails.getI_bendemographics().getCommunityName());
+			identityEditDTO.setCommunityName(benificiaryDetails.getI_bendemographics().getCommunityName());
+		}
 		if (benificiaryDetails.getBeneficiaryIdentities() != null
 				&& benificiaryDetails.getBeneficiaryIdentities().size() > 0) {
 			identityEditDTO.setIdentities(Identity.createIdentity(benificiaryDetails.getBeneficiaryIdentities(),
diff --git a/src/main/java/com/iemr/common/service/sms/SMSServiceImpl.java b/src/main/java/com/iemr/common/service/sms/SMSServiceImpl.java
index 726862ca..c9ce6ef8 100644
--- a/src/main/java/com/iemr/common/service/sms/SMSServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/sms/SMSServiceImpl.java
@@ -801,8 +801,9 @@ private static String getSubstringInRange(String input, int startIndex, int endI
 	@Override
 	public void publishSMS() {
 		RestTemplate restTemplateLogin = new RestTemplate();
-		if (!SMSServiceImpl.publishingSMS) {
-			try {
+
+		try {
+			if (!SMSServiceImpl.publishingSMS) {
 				SMSServiceImpl.publishingSMS = true;
 				Boolean doSendSMS = ConfigProperties.getBoolean("send-sms");
 				String sendSMSURL = ConfigProperties.getPropertyByName("send-message-url");
@@ -875,11 +876,11 @@ public void publishSMS() {
 						sms = smsNotification.save(sms);
 					}
 				}
-			} catch (Exception e) {
-				logger.error("publishSMS failed with error " + e.getMessage());
-			} finally {
-				SMSServiceImpl.publishingSMS = false;
 			}
+		} catch (Exception e) {
+			logger.error("publishSMS failed with error " + e.getMessage());
+		} finally {
+			SMSServiceImpl.publishingSMS = false;
 		}
 	}