diff --git a/src/node_api.cc b/src/node_api.cc
index 63ce1d8e86955e..d129aa6ef21d4d 100644
--- a/src/node_api.cc
+++ b/src/node_api.cc
@@ -3354,10 +3354,11 @@ class Work : public node::AsyncResource {
       // report it as a fatal exception. (There is no JavaScript on the
       // callstack that can possibly handle it.)
       if (!env->last_exception.IsEmpty()) {
-        v8::TryCatch try_catch(env->isolate);
-        env->isolate->ThrowException(
-          v8::Local<v8::Value>::New(env->isolate, env->last_exception));
-        node::FatalException(env->isolate, try_catch);
+        v8::Local<v8::Value> err = v8::Local<v8::Value>::New(
+          env->isolate, env->last_exception);
+        v8::Local<v8::Message> msg = v8::Exception::CreateMessage(
+          env->isolate, err);
+        node::FatalException(env->isolate, err, msg);
       }
     }
   }
diff --git a/src/node_internals.h b/src/node_internals.h
index 2faa6f93475ad7..3d67b4e1d0774f 100644
--- a/src/node_internals.h
+++ b/src/node_internals.h
@@ -250,6 +250,11 @@ void GetSockOrPeerName(const v8::FunctionCallbackInfo<v8::Value>& args) {
   args.GetReturnValue().Set(err);
 }
 
+void FatalException(v8::Isolate* isolate,
+                    v8::Local<v8::Value> error,
+                    v8::Local<v8::Message> message);
+
+
 void SignalExit(int signo);
 #ifdef __POSIX__
 void RegisterSignalHandler(int signal,
diff --git a/test/addons-napi/test_async/test-uncaught.js b/test/addons-napi/test_async/test-uncaught.js
new file mode 100644
index 00000000000000..fdcb3203f54410
--- /dev/null
+++ b/test/addons-napi/test_async/test-uncaught.js
@@ -0,0 +1,18 @@
+'use strict';
+const common = require('../../common');
+const assert = require('assert');
+const test_async = require(`./build/${common.buildType}/test_async`);
+
+process.on('uncaughtException', common.mustCall(function(err) {
+  try {
+    throw new Error('should not fail');
+  } catch (err) {
+    assert.strictEqual(err.message, 'should not fail');
+  }
+  assert.strictEqual(err.message, 'uncaught');
+}));
+
+// Successful async execution and completion callback.
+test_async.Test(5, {}, common.mustCall(function() {
+  throw new Error('uncaught');
+}));