killbill-uncached

diff --git a/util/src/main/java/com/ning/billing/util/callcontext/InternalCallContextFactory.java b/util/src/main/java/com/ning/billing/util/callcontext/InternalCallContextFactory.java
index 31d9842..e3b2af9 100644
--- a/util/src/main/java/com/ning/billing/util/callcontext/InternalCallContextFactory.java
+++ b/util/src/main/java/com/ning/billing/util/callcontext/InternalCallContextFactory.java
@@ -274,7 +274,8 @@ public class InternalCallContextFactory {
                     if (values.size() == 0) {
                         return null;
                     } else {
-                        return (Long) values.get(0).get(columnName);
+                        final Object tenantRecordId = values.get(0).get(columnName);
+                        return tenantRecordId == null ? null : Long.valueOf(tenantRecordId.toString());
                     }
                 }
             });