diff --git a/lib/6to5/util.js b/lib/6to5/util.js
index 6968c755b8..d79d53d6b2 100644
--- a/lib/6to5/util.js
+++ b/lib/6to5/util.js
@@ -268,12 +268,15 @@ exports.parse = function (opts, code, callback) {
   } catch (err) {
     if (!err._6to5) {
       err._6to5 = true;
-      err.message = opts.filename + ": " + err.message;
+      var message = opts.filename + ": " + err.message;
 
       if (err.loc) {
         var frame = exports.codeFrame(code, err.loc.line, err.loc.column);
-        err.message = err.message + frame;
+        message += frame;
       }
+
+      err.stack = err.stack.replace(err.message, message);
+      err.message = message;
     }
 
     throw err;