diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index f6dfb0ee7..f2a5bd131 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -357,7 +357,7 @@ define([
                     title: pad[2] || hash && hash.slice(0,8),
                     ctime: pad[1],
                 };
-            } else if (typeof(pad) === 'object') {
+            } else if (pad && typeof(pad) === 'object') {
                 if (!pad.ctime) { pad.ctime = pad.atime; }
                 if (!pad.title) {
                     pad.href.replace(/#(.*)$/, function (x, hash) {
@@ -373,7 +373,7 @@ define([
             } else {
                 console.error("[Cryptpad.migrateRecentPads] pad had unexpected value");
                 console.log(pad);
-                return {};
+                return;
             }
         }).filter(function (x) { return x; });
     };