diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/service/GuarantorWritePlatformServiceJpaRepositoryIImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/service/GuarantorWritePlatformServiceJpaRepositoryIImpl.java
index a48e695ec..207023db3 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/service/GuarantorWritePlatformServiceJpaRepositoryIImpl.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/service/GuarantorWritePlatformServiceJpaRepositoryIImpl.java
@@ -81,7 +81,7 @@ public class GuarantorWritePlatformServiceJpaRepositoryIImpl implements Guaranto
             final Long entityId = guarantorCommand.getEntityId();
 
             for (final Guarantor guarantor : existGuarantorList) {
-                if (guarantor.getLoanId() == loanId && guarantor.getEntityId() == entityId) {
+                if (guarantor.getLoanId() == loanId && entityId !=null && guarantor.getEntityId() == entityId) {
                     String defaultUserMessage = this.clientRepositoryWrapper.findOneWithNotFoundDetection(entityId).getDisplayName();
                     defaultUserMessage = defaultUserMessage + " is already exist as a guarantor for this loan";
                     final String action = loan.client() != null ? "client.guarantor" : "group.guarantor";