killbill-memoizeit

diff --git a/jaxrs/src/test/java/com/ning/billing/jaxrs/json/TestSubscriptionJsonNoEvents.java b/jaxrs/src/test/java/com/ning/billing/jaxrs/json/TestSubscriptionJsonNoEvents.java
index 34ada37..b922b05 100644
--- a/jaxrs/src/test/java/com/ning/billing/jaxrs/json/TestSubscriptionJsonNoEvents.java
+++ b/jaxrs/src/test/java/com/ning/billing/jaxrs/json/TestSubscriptionJsonNoEvents.java
@@ -105,6 +105,12 @@ public class TestSubscriptionJsonNoEvents extends JaxrsTestSuite {
         Mockito.when(subscription.getCurrentPlan()).thenReturn(plan);
         Mockito.when(subscription.getCurrentPriceList()).thenReturn(priceList);
         Mockito.when(subscription.getChargedThroughDate()).thenReturn(new DateTime(DateTimeZone.UTC));
+        final String productName = product.getName();
+        Mockito.when(subscription.getLastActiveProductName()).thenReturn(productName);
+        final String productCategory = plan.getProduct().getCategory().toString();
+        Mockito.when(subscription.getLastActiveCategoryName()).thenReturn(productCategory);
+        final String billingPeriod = plan.getBillingPeriod().toString();
+        Mockito.when(subscription.getLastActiveBillingPeriod()).thenReturn(billingPeriod);
 
         final SubscriptionJsonNoEvents subscriptionJsonNoEvents = new SubscriptionJsonNoEvents(subscription, null);
         Assert.assertEquals(subscriptionJsonNoEvents.getSubscriptionId(), subscription.getId().toString());

diff --git a/overdue/src/main/java/com/ning/billing/overdue/calculator/BillingStateCalculatorBundle.java b/overdue/src/main/java/com/ning/billing/overdue/calculator/BillingStateCalculatorBundle.java
index fea8534..a72ca90 100644
--- a/overdue/src/main/java/com/ning/billing/overdue/calculator/BillingStateCalculatorBundle.java
+++ b/overdue/src/main/java/com/ning/billing/overdue/calculator/BillingStateCalculatorBundle.java
@@ -131,7 +131,7 @@ public class BillingStateCalculatorBundle extends BillingStateCalculator<Subscri
 
     private boolean invoiceHasAnItemFromBundle(final Invoice invoice, final UUID bundleId) {
         for (final InvoiceItem item : invoice.getInvoiceItems()) {
-            if (item.getBundleId().equals(bundleId)) {
+            if (item.getBundleId() != null && item.getBundleId().equals(bundleId)) {
                 return true;
             }
         }