nodejs
diff --git a/Collapse file
‎src/node.cc‎
Copy file name to clipboardExpand all lines: src/node.cc
+4-2Lines changed: 4 additions & 2 deletions b/Collapse file
‎src/node.cc‎
Copy file name to clipboardExpand all lines: src/node.cc
+4-2Lines changed: 4 additions & 2 deletions
diff --git a/Collapse file
‎test/fixtures/throws_error7.js‎
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions b/Collapse file
‎test/fixtures/throws_error7.js‎
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions
diff --git a/Collapse file
‎test/parallel/test-error-reporting.js‎
Copy file name to clipboardExpand all lines: test/parallel/test-error-reporting.js
+6-3Lines changed: 6 additions & 3 deletions b/Collapse file
‎test/parallel/test-error-reporting.js‎
Copy file name to clipboardExpand all lines: test/parallel/test-error-reporting.js
+6-3Lines changed: 6 additions & 3 deletions
@@ -1511,8 +1511,10 @@ static void ReportException(Environment* env,
         name.IsEmpty() ||
         name->IsUndefined()) {
       // Not an error object. Just print as-is.
-      node::Utf8Value message(env->isolate(), er);
-      PrintErrorString("%s\n", *message);
+      String::Utf8Value message(er);
+
+      PrintErrorString("%s\n", *message ? *message :
+                                          "<toString() threw exception>");
     } else {
       node::Utf8Value name_string(env->isolate(), name);
       node::Utf8Value message_string(env->isolate(), message);
 
@@ -0,0 +1,5 @@
+throw {
+  toString: function() {
+    throw this;
+  }
+};
@@ -24,8 +24,6 @@ function errExec(script, callback) {
 
     // Count the tests
     exits++;
-
-    console.log('.');
   });
 }
 
@@ -64,6 +62,11 @@ errExec('throws_error6.js', function(err, stdout, stderr) {
   assert.ok(/SyntaxError/.test(stderr));
 });
 
+// Object that throws in toString() doesn't print garbage
+errExec('throws_error7.js', function(err, stdout, stderr) {
+  assert.ok(/<toString\(\) threw exception/.test(stderr));
+});
+
 process.on('exit', function() {
-  assert.equal(6, exits);
+  assert.equal(7, exits);
 });