diff --git a/src/addons.js b/src/addons.js
index 8d8297944..65b1955a5 100644
--- a/src/addons.js
+++ b/src/addons.js
@@ -124,6 +124,8 @@ function setupAddons(app, addons, callback) {
 
     if (!addons) return callback(null);
 
+    debugApp(app, 'setupAddons: Settings up %j', Object.keys(addons));
+
     async.eachSeries(Object.keys(addons), function iterator(addon, iteratorCallback) {
         if (!(addon in KNOWN_ADDONS)) return iteratorCallback(new Error('No such addon:' + addon));
 
@@ -140,6 +142,8 @@ function teardownAddons(app, addons, callback) {
 
     if (!addons) return callback(null);
 
+    debugApp(app, 'teardownAddons: Tearing down %j', Object.keys(addons));
+
     async.eachSeries(Object.keys(addons), function iterator(addon, iteratorCallback) {
         if (!(addon in KNOWN_ADDONS)) return iteratorCallback(new Error('No such addon:' + addon));
 
@@ -158,6 +162,8 @@ function backupAddons(app, addons, callback) {
 
     if (!addons) return callback(null);
 
+    debugApp(app, 'backupAddons: Backing up %j', Object.keys(addons));
+
     async.eachSeries(Object.keys(addons), function iterator (addon, iteratorCallback) {
         if (!(addon in KNOWN_ADDONS)) return iteratorCallback(new Error('No such addon:' + addon));
 
@@ -174,6 +180,8 @@ function restoreAddons(app, addons, callback) {
 
     if (!addons) return callback(null);
 
+    debugApp(app, 'restoreAddons: restoring %j', Object.keys(addons));
+
     async.eachSeries(Object.keys(addons), function iterator (addon, iteratorCallback) {
         if (!(addon in KNOWN_ADDONS)) return iteratorCallback(new Error('No such addon:' + addon));
 
diff --git a/src/apptask.js b/src/apptask.js
index 5ba1807d4..40a767070 100644
--- a/src/apptask.js
+++ b/src/apptask.js
@@ -606,7 +606,10 @@ function backup(app, callback) {
 function restore(app, callback) {
     // we don't have a backup, same as re-install. this allows us to install from install failures (update failures always
     // have a backupId)
-    if (!app.lastBackupId) return install(app, callback);
+    if (!app.lastBackupId) {
+        debugApp(app, 'No lastBackupId. reinstalling');
+        return install(app, callback);
+    }
 
     async.series([
         updateApp.bind(null, app, { installationProgress: '10, Cleaning up old install' }),