killbill-aplcache

diff --git a/invoice/src/main/java/com/ning/billing/invoice/model/DefaultInvoiceItem.java b/invoice/src/main/java/com/ning/billing/invoice/model/DefaultInvoiceItem.java
index 84a3632..9e229fb 100644
--- a/invoice/src/main/java/com/ning/billing/invoice/model/DefaultInvoiceItem.java
+++ b/invoice/src/main/java/com/ning/billing/invoice/model/DefaultInvoiceItem.java
@@ -18,6 +18,7 @@ package com.ning.billing.invoice.model;
 
 import com.ning.billing.catalog.api.Currency;
 import com.ning.billing.invoice.api.InvoiceItem;
+import com.sun.xml.internal.bind.v2.runtime.reflect.Lister;
 import org.joda.time.DateTime;
 
 import javax.annotation.Nullable;
@@ -248,9 +249,28 @@ public class DefaultInvoiceItem implements InvoiceItem {
         sb.append("subscriptionId = ").append(subscriptionId.toString()).append(", ");
         sb.append("startDate = ").append(startDate.toString()).append(", ");
         sb.append("endDate = ").append(startDate.toString()).append(", ");
-        sb.append("recurringAmount = ") .append(recurringAmount.toString()).append(", ");
-        sb.append("recurringRate = ").append(recurringRate.toString()).append(", ");
-        sb.append("fixedAmount = ").append(fixedAmount.toString());
+        sb.append("recurringAmount = ");
+        if (recurringAmount == null) {
+            sb.append("null");
+        } else {
+            sb.append(recurringAmount.toString());
+        }
+        sb.append(", ");
+
+        sb.append("recurringRate = ");
+        if (recurringRate == null) {
+            sb.append("null");
+        } else {
+            sb.append(recurringRate.toString());
+        }
+        sb.append(", ");
+
+        sb.append("fixedAmount = ");
+        if (fixedAmount == null) {
+            sb.append("null");
+        } else {
+            sb.append(fixedAmount.toString());
+        }
 
         sb.append("}");
         return sb.toString();

diff --git a/invoice/src/test/java/com/ning/billing/invoice/tests/DefaultInvoiceGeneratorTests.java b/invoice/src/test/java/com/ning/billing/invoice/tests/DefaultInvoiceGeneratorTests.java
index 4b7a679..659f183 100644
--- a/invoice/src/test/java/com/ning/billing/invoice/tests/DefaultInvoiceGeneratorTests.java
+++ b/invoice/src/test/java/com/ning/billing/invoice/tests/DefaultInvoiceGeneratorTests.java
@@ -488,7 +488,7 @@ public class DefaultInvoiceGeneratorTests extends InvoicingTestBase {
         BillingEvent event4 = new DefaultBillingEvent(subscription, new DateTime("2012-03-01T00:02:04.000Z"),
                                                       pistol, pistolMonthlyEvergreen,
                                                       null, pistolEvergreenPrice, BillingPeriod.MONTHLY, billCycleDay,
-                                                      BillingModeType.IN_ADVANCE, "Test Event 3");
+                                                      BillingModeType.IN_ADVANCE, "Test Event 4");
         events.add(event4);
 
         InvoiceItemList items = new InvoiceItemList();