killbill-aplcache

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/AuditedEntitlementDao.java b/entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/AuditedEntitlementDao.java
index b2816ce..455fe64 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/AuditedEntitlementDao.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/AuditedEntitlementDao.java
@@ -567,7 +567,7 @@ public class AuditedEntitlementDao implements EntitlementDao {
                     final String baseProductName = (futureBaseEvent instanceof ApiEventChange) ?
                             ((ApiEventChange) futureBaseEvent).getEventPlan() : null;
 
-                    final boolean createCancelEvent = (futureBaseEvent != null) &&
+                    final boolean createCancelEvent = (futureBaseEvent != null && targetAddOnPlan != null) &&
                             ((futureBaseEvent instanceof ApiEventCancel) ||
                                     ((!addonUtils.isAddonAvailableFromPlanName(baseProductName, futureBaseEvent.getEffectiveDate(), targetAddOnPlan)) ||
                                             (addonUtils.isAddonIncludedFromPlanName(baseProductName, futureBaseEvent.getEffectiveDate(), targetAddOnPlan))));