diff --git a/lib/s3-adapter.js b/lib/s3-adapter.js
index 00aae6c..a5fe1fd 100644
--- a/lib/s3-adapter.js
+++ b/lib/s3-adapter.js
@@ -321,6 +321,8 @@ module.exports = CoreObject.extend({
       this.client.putBucketWebsite(params, function(err, data) {
         if (err) {
           reject(err);
+        } else if (!data.Body) {
+          reject(new SilentError('No data received: please verify correct "indexMode" config.'));
         } else {
           resolve(data.Body);
         }
@@ -407,7 +409,7 @@ module.exports = CoreObject.extend({
 
   _getFormattedErrorMessage: function(message, error) {
     message = message + '\n\n';
-    error = (error) ? (error.stack + '\n') : '';
+    error = (error) ? (error.stack || error.message + '\n') : '';
     return message + error;
   }
 });