diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java index cbe94031e..ca560d75e 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java @@ -376,10 +376,11 @@ public class LoanWritePlatformServiceJpaRepositoryImpl implements LoanWritePlatf // Get disbursedAmount final BigDecimal disbursedAmount = loan.getDisbursedAmount(); + final Set loanCollateralManagements = loan.getLoanCollateralManagements(); // Get relevant loan collateral modules - if (AccountType.fromInt(loan.getLoanType()).isIndividualAccount()) { - final Set loanCollateralManagements = loan.getLoanCollateralManagements(); + if ((loanCollateralManagements != null && loanCollateralManagements.size() != 0) + && AccountType.fromInt(loan.getLoanType()).isIndividualAccount()) { BigDecimal totalCollateral = BigDecimal.valueOf(0);