diff --git a/www/common/userObject.js b/www/common/userObject.js
index 7825161e4..8a3662a7b 100644
--- a/www/common/userObject.js
+++ b/www/common/userObject.js
@@ -426,6 +426,7 @@ define([
 
             getFiles([FILES_DATA]).forEach(function (id) {
                 var data = allFilesList[id];
+                if (!data) { return; }
                 if (Array.isArray(data.tags) && containsSearchedTag(data.tags)) {
                     res.push(id);
                 } else
diff --git a/www/olddrive/tests.js b/www/drive/tests.js
similarity index 100%
rename from www/olddrive/tests.js
rename to www/drive/tests.js