Merge branch 'master' into livereload

2 files changed, 8 insertions, 3 deletions

diff --git a/bin/build.js b/bin/build.js
index 257715d..5894d00 100644
--- a/bin/build.js
+++ b/bin/build.js
@@ -33,8 +33,11 @@ var makeBuildFunc = function(converter) {
         .then(function(output) {
             console.log("Successfuly built !");
             return output;
-        }, utils.logError);
-    };   
+        }, utils.logError)
+        .fail(function() {
+            process.exit(-1);
+        });
+    };
 };
 
 module.exports = {
diff --git a/bin/utils.js b/bin/utils.js
index b43936f..74a09b5 100644
--- a/bin/utils.js
+++ b/bin/utils.js
@@ -30,7 +30,9 @@ function watch(dir) {
 }
 
 function logError(err) {
-    console.log(err.stack || err.message || err);
+    var message = err.message || err;
+    if (process.env.DEBUG != null) message = err.stack || message;
+    console.log(message);
     return Q.reject(err);
 };