--- a/common/corpus-common-addon/addon/services/resolver-service.js	Tue Dec 13 23:30:54 2016 +0100
+++ b/common/corpus-common-addon/addon/services/resolver-service.js	Fri Dec 16 17:43:07 2016 +0100
@@ -105,7 +105,11 @@
         .then(function (names) {
           delete this.get('promises').storeKey; /* eslint prefer-reflect: "off" */
 
-          return store.set(storeKey, names[this.getReturnDictKey(objectId)]);
+          if (names) {
+            return store.set(storeKey, names[this.getReturnDictKey(objectId)]);
+          }
+
+          return null;
         }.bind(this));
       this.get('promises')[storeKey] = namePromise;
     }