diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/ClientWritePlatformServiceJpaRepositoryImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/ClientWritePlatformServiceJpaRepositoryImpl.java index 674405321..8eb501644 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/ClientWritePlatformServiceJpaRepositoryImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/ClientWritePlatformServiceJpaRepositoryImpl.java @@ -581,15 +581,16 @@ public class ClientWritePlatformServiceJpaRepositoryImpl implements ClientWriteP private void validateParentGroupRulesBeforeClientActivation(Client client) { Integer minNumberOfClients = configurationDomainService.retrieveMinAllowedClientsInGroup(); Integer maxNumberOfClients = configurationDomainService.retrieveMaxAllowedClientsInGroup(); - for (Group group : client.getGroups()) { - /** - * Since this Client has not yet been associated with the group, - * reduce maxNumberOfClients by 1 - **/ - final boolean validationsuccess = group.isGroupsClientCountWithinMaxRange(maxNumberOfClients - 1); - if (!validationsuccess) { throw new GroupMemberCountNotInPermissibleRangeException(group.getId(), minNumberOfClients, - maxNumberOfClients); } + if (client.getGroups() != null) { + for (Group group : client.getGroups()) { + /** + * Since this Client has not yet been associated with the group, + * reduce maxNumberOfClients by 1 + **/ + final boolean validationsuccess = group.isGroupsClientCountWithinMaxRange(maxNumberOfClients - 1); + if (!validationsuccess) { throw new GroupMemberCountNotInPermissibleRangeException(group.getId(), minNumberOfClients, + maxNumberOfClients); } + } } } - } \ No newline at end of file