diff --git a/src/SetupStore.js b/src/SetupStore.js
index f85a4d89aa..d8e2b88661 100644
--- a/src/SetupStore.js
+++ b/src/SetupStore.js
@@ -237,6 +237,7 @@ var SetupStore = assign(Object.create(EventEmitter.prototype), {
           error: err,
           output: err.message
         }, 'info');
+        err.message = util.removeSensitiveData(err.message);
         _error = err;
         this.emit(this.ERROR_EVENT);
         yield this.pause();
diff --git a/src/WebUtil.js b/src/WebUtil.js
index 8eb4cfcb0d..bbd63a99fe 100644
--- a/src/WebUtil.js
+++ b/src/WebUtil.js
@@ -46,7 +46,6 @@ var WebUtil = {
         for(var key in payload.metaData) {
           payload.metaData[key] = util.removeSensitiveData(payload.metaData[key]);
         }
-        console.log(payload);
       };
     }
   },