diff --git a/src/lib/libpromise.js b/src/lib/libpromise.js
index 96d65c3d92923..3b5e25a10084b 100644
--- a/src/lib/libpromise.js
+++ b/src/lib/libpromise.js
@@ -6,7 +6,7 @@
 
 addToLibrary({
   $promiseMap__deps: ['$HandleAllocator'],
-  $promiseMap: "new HandleAllocator();",
+  $promiseMap: 'new HandleAllocator();',
 
   $getPromise__deps: ['$promiseMap'],
   $getPromise: (id) => promiseMap.get(id).promise,
@@ -73,7 +73,7 @@ addToLibrary({
         return;
     }
 #if ASSERTIONS
-    abort("unexpected promise callback result " + result);
+    abort(`unexpected promise callback result ${result}`);
 #endif
   },
 
@@ -84,6 +84,7 @@ addToLibrary({
                                '$stackRestore',
                                '$stackSave'],
   $makePromiseCallback: (callback, userData) => {
+    if (!callback) return;
     return (value) => {
 #if RUNTIME_DEBUG
       dbg(`emscripten promise callback: ${value}`);
@@ -131,7 +132,7 @@ addToLibrary({
           throw resultVal;
       }
 #if ASSERTIONS
-      abort("unexpected promise callback result " + result);
+      abort(`unexpected promise callback result ${result}`);
 #endif
     };
   },
@@ -217,7 +218,7 @@ addToLibrary({
     dbg(`emscripten_promise_any: ${promises}`);
 #endif
 #if ASSERTIONS
-    assert(typeof Promise.any != 'undefined', "Promise.any does not exist");
+    assert(typeof Promise.any != 'undefined', 'Promise.any does not exist');
 #endif
     var id = addPromise(Promise.any(promises).catch((err) => {
       if (errorBuf) {
diff --git a/test/codesize/test_codesize_hello_dylink_all.json b/test/codesize/test_codesize_hello_dylink_all.json
index eb76d39dfba46..1e24024f938fc 100644
--- a/test/codesize/test_codesize_hello_dylink_all.json
+++ b/test/codesize/test_codesize_hello_dylink_all.json
@@ -1,7 +1,7 @@
 {
-  "a.out.js": 268075,
+  "a.out.js": 268089,
   "a.out.nodebug.wasm": 587563,
-  "total": 855638,
+  "total": 855652,
   "sent": [
     "IMG_Init",
     "IMG_Load",
diff --git a/test/core/test_promise.c b/test/core/test_promise.c
index 3a19875acb052..33ca35386fd46 100644
--- a/test/core/test_promise.c
+++ b/test/core/test_promise.c
@@ -498,6 +498,36 @@ static em_promise_result_t test_race(void** result, void* data, void* value) {
   return EM_PROMISE_MATCH_RELEASE;
 }
 
+static em_promise_result_t test_null_handlers(void** result, void* data, void* value) {
+  emscripten_console_log("test_null_handlers");
+  assert(data == (void*)8);
+
+  em_promise_t fulfilled = emscripten_promise_create();
+  emscripten_promise_resolve(fulfilled, EM_PROMISE_FULFILL, (void*)42);
+  // Pass NULL as onFulfilled, it should just pass through the value.
+  em_promise_t next1 = emscripten_promise_then(fulfilled, NULL, fail, NULL);
+  em_promise_t next2 = emscripten_promise_then(next1, expect_success, fail, NULL);
+
+  em_promise_t rejected = emscripten_promise_create();
+  emscripten_promise_resolve(rejected, EM_PROMISE_REJECT, (void*)43);
+  // Pass NULL as onRejected, it should just pass through the error.
+  em_promise_t next3 = emscripten_promise_then(rejected, fail, NULL, NULL);
+  em_promise_t next4 = emscripten_promise_then(next3, fail, expect_error, NULL);
+
+  em_promise_t to_finish[2] = {next2, next4};
+  em_promise_t finish_test_null = emscripten_promise_all(to_finish, NULL, 2);
+
+  emscripten_promise_destroy(fulfilled);
+  emscripten_promise_destroy(next1);
+  emscripten_promise_destroy(next2);
+  emscripten_promise_destroy(rejected);
+  emscripten_promise_destroy(next3);
+  emscripten_promise_destroy(next4);
+
+  *result = finish_test_null;
+  return EM_PROMISE_MATCH_RELEASE;
+}
+
 static em_promise_result_t finish(void** result, void* data, void* value) {
   emscripten_console_logf("finish");
 
@@ -547,8 +577,10 @@ int main() {
   em_promise_t test6 = emscripten_promise_then(test5, test_any, fail, (void*)6);
   em_promise_t test7 =
     emscripten_promise_then(test6, test_race, fail, (void*)7);
+  em_promise_t test8 =
+    emscripten_promise_then(test7, test_null_handlers, fail, (void*)8);
   em_promise_t assert_stack =
-    emscripten_promise_then(test7, check_stack, fail, NULL);
+    emscripten_promise_then(test8, check_stack, fail, NULL);
   em_promise_t end = emscripten_promise_then(assert_stack, finish, fail, NULL);
 
   emscripten_promise_resolve(start, EM_PROMISE_FULFILL, NULL);
@@ -562,6 +594,7 @@ int main() {
   emscripten_promise_destroy(test5);
   emscripten_promise_destroy(test6);
   emscripten_promise_destroy(test7);
+  emscripten_promise_destroy(test8);
   emscripten_promise_destroy(assert_stack);
   emscripten_promise_destroy(end);
 
diff --git a/test/core/test_promise.out b/test/core/test_promise.out
index 84f57b62633e2..cc0c5aa475b18 100644
--- a/test/core/test_promise.out
+++ b/test/core/test_promise.out
@@ -31,4 +31,7 @@ promise_any reasons:
 test_race
 expected success: 42
 expected error: 42
+test_null_handlers
+expected success: 42
+expected error: 43
 finish