killbill-memoizeit

diff --git a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/AnalyticsDao.java b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/AnalyticsDao.java
index ac39ac7..7eda054 100644
--- a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/AnalyticsDao.java
+++ b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/AnalyticsDao.java
@@ -177,6 +177,6 @@ public class AnalyticsDao {
 
     private Long getTenantRecordId(final TenantContext context) {
         final RecordIdApi recordIdApi = osgiKillbillAPI.getRecordIdApi();
-        return recordIdApi == null ? -1L : recordIdApi.getRecordId(context.getTenantId(), ObjectType.TENANT, context);
+        return (recordIdApi == null || context.getTenantId() == null) ? -1L : recordIdApi.getRecordId(context.getTenantId(), ObjectType.TENANT, context);
     }
 }