From d5ef1033c358f7339adfdae279a6c6d2e8ff08e6 Mon Sep 17 00:00:00 2001
From: Keith Woodlock <keithwoodlock@gmail.com>
Date: Sat, 4 May 2013 00:08:46 +0100
Subject: [PATCH] MIFOSX-335: Fix error with adding loan charge to loan
 application.

---
 .../org/mifosplatform/portfolio/loanaccount/domain/Loan.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/Loan.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/Loan.java
index 6c0ddd6bb..b4ce5cf55 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/Loan.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/Loan.java
@@ -475,7 +475,7 @@ public class Loan extends AbstractPersistable<Long> {
 
             // if loan charge is to be applied on a future date, the loan
             // transaction would show todays date as applied date
-            if (currentDate.isBefore(transactionDate)) {
+            if (transactionDate == null || currentDate.isBefore(transactionDate)) {
                 transactionDate = currentDate;
             }
         }