killbill-aplcache

diff --git a/account/src/main/java/com/ning/billing/account/api/svcs/DefaultAccountInternalApi.java b/account/src/main/java/com/ning/billing/account/api/svcs/DefaultAccountInternalApi.java
index 80b03c9..93d7cf9 100644
--- a/account/src/main/java/com/ning/billing/account/api/svcs/DefaultAccountInternalApi.java
+++ b/account/src/main/java/com/ning/billing/account/api/svcs/DefaultAccountInternalApi.java
@@ -59,12 +59,8 @@ public class DefaultAccountInternalApi implements AccountInternalApi {
 
     @Override
     public Account getAccountByRecordId(final Long recordId, final InternalTenantContext context) throws AccountApiException {
-        try {
-            final AccountModelDao account = accountDao.getByRecordId(recordId, context);
-            return new DefaultAccount(account);
-        } catch (NullPointerException e) {
-            return null;
-        }
+        final AccountModelDao accountModelDao = getAccountModelDaoByRecordId(recordId, context);
+        return new DefaultAccount(accountModelDao);
     }
 
     @Override
@@ -115,11 +111,16 @@ public class DefaultAccountInternalApi implements AccountInternalApi {
     }
 
     @Override
-    public UUID getByRecordId(final Long recordId, final InternalCallContext context) throws AccountApiException {
+    public UUID getByRecordId(final Long recordId, final InternalTenantContext context) throws AccountApiException {
+        final AccountModelDao accountModelDao = getAccountModelDaoByRecordId(recordId, context);
+        return accountModelDao.getId();
+    }
+
+    private AccountModelDao getAccountModelDaoByRecordId(final Long recordId, final InternalTenantContext context) throws AccountApiException {
         final AccountModelDao accountModelDao = accountDao.getByRecordId(recordId, context);
         if (accountModelDao == null) {
             throw new AccountApiException(ErrorCode.ACCOUNT_DOES_NOT_EXIST_FOR_RECORD_ID, recordId);
         }
-        return accountModelDao.getId();
+        return accountModelDao;
     }
 }

diff --git a/util/src/main/java/com/ning/billing/util/svcapi/account/AccountInternalApi.java b/util/src/main/java/com/ning/billing/util/svcapi/account/AccountInternalApi.java
index b86da74..4d6127a 100644
--- a/util/src/main/java/com/ning/billing/util/svcapi/account/AccountInternalApi.java
+++ b/util/src/main/java/com/ning/billing/util/svcapi/account/AccountInternalApi.java
@@ -41,5 +41,5 @@ public interface AccountInternalApi {
 
     public void updatePaymentMethod(UUID accountId, UUID paymentMethodId, InternalCallContext context) throws AccountApiException;
 
-    public UUID getByRecordId(Long recordId, InternalCallContext context) throws AccountApiException;
+    public UUID getByRecordId(Long recordId, InternalTenantContext context) throws AccountApiException;
 }