killbill-memoizeit

diff --git a/analytics/src/test/java/com/ning/billing/analytics/MockPhase.java b/analytics/src/test/java/com/ning/billing/analytics/MockPhase.java
index 4912957..2303e1d 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/MockPhase.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/MockPhase.java
@@ -16,9 +16,6 @@
 
 package com.ning.billing.analytics;
 
-import java.math.BigDecimal;
-import java.util.Date;
-
 import com.ning.billing.catalog.api.BillingPeriod;
 import com.ning.billing.catalog.api.Currency;
 import com.ning.billing.catalog.api.IDuration;
@@ -28,6 +25,9 @@ import com.ning.billing.catalog.api.IPlanPhase;
 import com.ning.billing.catalog.api.IPrice;
 import com.ning.billing.catalog.api.PhaseType;
 
+import java.math.BigDecimal;
+import java.util.Date;
+
 public class MockPhase implements IPlanPhase
 {
     private final PhaseType cohort;
@@ -60,10 +60,11 @@ public class MockPhase implements IPlanPhase
                 return BigDecimal.valueOf(price);
             }
 
-			@Override
-			public Date getEffectiveDateForExistingSubscriptons() {
-				return new Date();
-			}
+            @Override
+            public Date getEffectiveDateForExistingSubscriptons()
+            {
+                return new Date();
+            }
         };
     }
 
@@ -83,11 +84,12 @@ public class MockPhase implements IPlanPhase
             {
                 return BigDecimal.valueOf(price);
             }
-            
-			@Override
-			public Date getEffectiveDateForExistingSubscriptons() {
-				return new Date();
-			}
+
+            @Override
+            public Date getEffectiveDateForExistingSubscriptons()
+            {
+                return new Date();
+            }
         };
     }
 
@@ -100,7 +102,12 @@ public class MockPhase implements IPlanPhase
     @Override
     public String getName()
     {
-        return plan.getName() + "-" + cohort;
+        if (plan == null) {
+            return null;
+        }
+        else {
+            return plan.getName() + "-" + cohort;
+        }
     }
 
     @Override