diff --git a/www/common/outer/userObject.js b/www/common/outer/userObject.js
index 1f8b73da9..e12883eb5 100644
--- a/www/common/outer/userObject.js
+++ b/www/common/outer/userObject.js
@@ -625,12 +625,12 @@ define([
                 var root = exp.find([ROOT]);
                 var toClean = [];
                 for (var id in fd) {
-                    id = Number(id);
-                    if (!id && id !== 0) {
+                    if (String(id) !== String(Number(id))) {
                         debug("Invalid file ID in filesData.", id);
                         toClean.push(id);
                         continue;
                     }
+                    id = Number(id);
                     var el = fd[id];
 
                     // Clean corrupted data
diff --git a/www/common/proxy-manager.js b/www/common/proxy-manager.js
index 8bbf641f6..fdfde9263 100644
--- a/www/common/proxy-manager.js
+++ b/www/common/proxy-manager.js
@@ -707,6 +707,7 @@ define([
             if (type === 'expirable') {
                 return function (fileId) {
                     var data = userObject.getFileData(fileId);
+                    if (!data) { return; }
                     // Don't push duplicates
                     if (result.indexOf(data.channel) !== -1) { return; }
                     // Return pads owned by someone else or expired by time
@@ -718,6 +719,7 @@ define([
             if (type === 'owned') {
                 return function (fileId) {
                     var data = userObject.getFileData(fileId);
+                    if (!data) { return; }
                     // Don't push duplicates
                     if (result.indexOf(data.channel) !== -1) { return; }
                     // Return owned pads