diff --git a/source/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java b/source/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java
index 2ddf15de61..271fe2f5a9 100644
--- a/source/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java
+++ b/source/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java
@@ -697,7 +697,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
         Pair<StoreRef, Node> rootNodePair = rootNodesCache.getByKey(storeRef);
         if (rootNodePair == null)
         {
-            throw new InvalidStoreRefException(storeRef);
+            return null;
         }
         else
         {
diff --git a/source/java/org/alfresco/repo/security/authority/AbstractAuthorityBridgeDAO.java b/source/java/org/alfresco/repo/security/authority/AbstractAuthorityBridgeDAO.java
index 31eead38ee..64beede669 100644
--- a/source/java/org/alfresco/repo/security/authority/AbstractAuthorityBridgeDAO.java
+++ b/source/java/org/alfresco/repo/security/authority/AbstractAuthorityBridgeDAO.java
@@ -97,11 +97,15 @@ public abstract class AbstractAuthorityBridgeDAO implements AuthorityBridgeDAO
         }
 
         // Get tenenat specifc store id
-        Long storeId = Long.MIN_VALUE;
         StoreRef tenantSpecificStoreRef = tenantService.getName(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE);
+        Long storeId = Long.MIN_VALUE;
         if (tenantSpecificStoreRef != null)
         {
-            storeId = nodeDAO.getStore(tenantSpecificStoreRef).getFirst();
+            Pair<Long, StoreRef> storePair = nodeDAO.getStore(tenantSpecificStoreRef);
+            if (storePair != null)
+            {
+                storeId = storePair.getFirst();
+            }
         }
 
         return selectAuthorityBridgeLinks(authorityContainerTypeQNameId, memberAssocQNameId, authorityNameQNameId, storeId);
@@ -137,11 +141,15 @@ public abstract class AbstractAuthorityBridgeDAO implements AuthorityBridgeDAO
         }
 
         // Get tenenat specifc store id
-        Long storeId = Long.MIN_VALUE;
         StoreRef tenantSpecificStoreRef = tenantService.getName(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE);
+        Long storeId = Long.MIN_VALUE;
         if (tenantSpecificStoreRef != null)
         {
-            storeId = nodeDAO.getStore(tenantSpecificStoreRef).getFirst();
+            Pair<Long, StoreRef> storePair = nodeDAO.getStore(tenantSpecificStoreRef);
+            if (storePair != null)
+            {
+                storeId = storePair.getFirst();
+            }
         }
 
         Pair<Long, NodeRef> pair = (authRef == null) ? null : nodeDAO.getNodePair(tenantService.getName(authRef));