diff --git a/knowledge/survey/response.py b/knowledge/survey/response.py
index 42dce8e..77e5b6f 100644
--- a/knowledge/survey/response.py
+++ b/knowledge/survey/response.py
@@ -64,8 +64,6 @@ class Responses(BaseRecordManager):
                 id += '.' + institutionId
             if referrerId:
                 id += '.' + referrerId
-            if self.storage is None:    # may happen after deletions
-                return {}
             tracks = self.storage.getUserTracks(self.uid, 0, id)
             if not tracks:  # then try without institution
                 tracks = self.storage.getUserTracks(self.uid, 0, personId)
diff --git a/organize/tracking/base.py b/organize/tracking/base.py
index 721f2df..645e091 100644
--- a/organize/tracking/base.py
+++ b/organize/tracking/base.py
@@ -51,8 +51,6 @@ class BaseRecordManager(object):
 
     @Lazy
     def storage(self):
-        if self.context is None:
-            return None
         records = self.loopsRoot.getRecordManager()
         if records is not None:
             return records.get(self.storageName)