nodejs
diff --git a/Collapse file
‎lib/util.js‎
Copy file name to clipboardExpand all lines: lib/util.js
+6-2Lines changed: 6 additions & 2 deletions b/Collapse file
‎lib/util.js‎
Copy file name to clipboardExpand all lines: lib/util.js
+6-2Lines changed: 6 additions & 2 deletions
diff --git a/Collapse file
‎test/parallel/test-util-format.js‎
Copy file name to clipboardExpand all lines: test/parallel/test-util-format.js
+10Lines changed: 10 additions & 0 deletions b/Collapse file
‎test/parallel/test-util-format.js‎
Copy file name to clipboardExpand all lines: test/parallel/test-util-format.js
+10Lines changed: 10 additions & 0 deletions
@@ -38,13 +38,17 @@ const inspectDefaultOptions = Object.seal({
   breakLength: 60
 });
 
+const CIRCULAR_ERROR_MESSAGE = 'Converting circular structure to JSON';
+
 var Debug;
 
 function tryStringify(arg) {
   try {
     return JSON.stringify(arg);
-  } catch (_) {
-    return '[Circular]';
+  } catch (err) {
+    if (err.name === 'TypeError' && err.message === CIRCULAR_ERROR_MESSAGE)
+      return '[Circular]';
+    throw err;
   }
 }
 
 
@@ -86,6 +86,16 @@ assert.strictEqual(util.format('o: %j, a: %j'), 'o: %j, a: %j');
   assert.strictEqual(util.format('%j', o), '[Circular]');
 }
 
+{
+  const o = {
+    toJSON() {
+      throw new Error('Not a circular object but still not serializable');
+    }
+  };
+  assert.throws(() => util.format('%j', o),
+                /^Error: Not a circular object but still not serializable$/);
+}
+
 // Errors
 const err = new Error('foo');
 assert.strictEqual(util.format(err), err.stack);