nodejs
diff --git a/‎lib/internal/process/execution.js‎
Lines changed: 7 additions & 2 deletions b/‎lib/internal/process/execution.js‎
Lines changed: 7 additions & 2 deletions
diff --git a/‎test/async-hooks/init-hooks.js‎
Lines changed: 0 additions & 3 deletions b/‎test/async-hooks/init-hooks.js‎
Lines changed: 0 additions & 3 deletions
diff --git a/‎test/async-hooks/test-unhandled-exception-valid-ids.js‎
Lines changed: 17 additions & 0 deletions b/‎test/async-hooks/test-unhandled-exception-valid-ids.js‎
Lines changed: 17 additions & 0 deletions
@@ -20,7 +20,8 @@ const {
   clearAsyncIdStack,
   hasAsyncIdStack,
   afterHooksExist,
-  emitAfter
+  emitAfter,
+  popAsyncContext,
 } = require('internal/async_hooks');
 
 // shouldAbortOnUncaughtToggle is a typed array for faster
@@ -183,7 +184,11 @@ function createOnGlobalUncaughtException() {
     // Emit the after() hooks now that the exception has been handled.
     if (afterHooksExist()) {
       do {
-        emitAfter(executionAsyncId());
+        const asyncId = executionAsyncId();
+        if (asyncId === 0)
+          popAsyncContext(0);
+        else
+          emitAfter(asyncId);
       } while (hasAsyncIdStack());
     }
     // And completely empty the id stack, including anything that may be
 
@@ -168,9 +168,6 @@ class ActivityCollector {
       }
       const err = new Error(`Found a handle whose ${hook}` +
                             ' hook was invoked but not its init hook');
-      // Don't throw if we see invocations due to an assertion in a test
-      // failing since we want to list the assertion failure instead
-      if (/process\._fatalException/.test(err.stack)) return null;
       throw err;
     }
     return h;
 
@@ -0,0 +1,17 @@
+'use strict';
+
+const common = require('../common');
+const initHooks = require('./init-hooks');
+
+const hooks = initHooks();
+hooks.enable();
+
+setImmediate(() => {
+  throw new Error();
+});
+
+setTimeout(() => {
+  throw new Error();
+}, 1);
+
+process.on('uncaughtException', common.mustCall(2));
Original file line number	Diff line number	Diff line change
@@ -168,9 +168,6 @@ class ActivityCollector {
168	168	}
169	169	const err = new Error(`Found a handle whose ${hook}` +
170	170	' hook was invoked but not its init hook');
171		- // Don't throw if we see invocations due to an assertion in a test
172		- // failing since we want to list the assertion failure instead
173		- if (/process\._fatalException/.test(err.stack)) return null;
174	171	throw err;
175	172	}
176	173	return h;