diff --git a/src/js_native_api_v8.cc b/src/js_native_api_v8.cc
index 08e4ef1593927d..191db139104da1 100644
--- a/src/js_native_api_v8.cc
+++ b/src/js_native_api_v8.cc
@@ -64,18 +64,11 @@ void napi_env__::InvokeFinalizerFromGC(v8impl::RefTracker* finalizer) {
     // The experimental code calls finalizers immediately to release native
     // objects as soon as possible. In that state any code that may affect GC
     // state causes a fatal error. To work around this issue the finalizer code
-    // must call node_api_post_finalizer.
-    if (last_error.error_code == napi_ok && last_exception.IsEmpty()) {
-      auto restore_state = node::OnScopeLeave(
-          [this, saved = in_gc_finalizer] { in_gc_finalizer = saved; });
-      in_gc_finalizer = true;
-      finalizer->Finalize();
-    } else {
-      // The finalizers can be run in the middle of JS or C++ code.
-      // That code may be in an error state. In that case use the asynchronous
-      // finalizer.
-      EnqueueFinalizer(finalizer);
-    }
+    // can call node_api_post_finalizer.
+    auto restore_state = node::OnScopeLeave(
+        [this, saved = in_gc_finalizer] { in_gc_finalizer = saved; });
+    in_gc_finalizer = true;
+    finalizer->Finalize();
   }
 }
 
@@ -89,11 +82,11 @@ napi_status NewString(napi_env env,
                       napi_value* result,
                       StringMaker string_maker) {
   CHECK_ENV(env);
+  env->CheckGCAccess();
   if (length > 0) CHECK_ARG(env, str);
   CHECK_ARG(env, result);
   RETURN_STATUS_IF_FALSE(
       env, (length == NAPI_AUTO_LENGTH) || length <= INT_MAX, napi_invalid_arg);
-  env->CheckGCAccess();
 
   auto isolate = env->isolate;
   auto str_maybe = string_maker(isolate);
@@ -114,6 +107,7 @@ napi_status NewExternalString(napi_env env,
                               StringMaker string_maker) {
   napi_status status;
 #if defined(V8_ENABLE_SANDBOX)
+  env->CheckGCAccess();
   status = create_api(env, str, length, result);
   if (status == napi_ok) {
     if (copied != nullptr) {
@@ -1480,6 +1474,7 @@ napi_status NAPI_CDECL napi_is_array(napi_env env,
                                      napi_value value,
                                      bool* result) {
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, value);
   CHECK_ARG(env, result);
 
@@ -1539,8 +1534,8 @@ napi_status NAPI_CDECL napi_get_prototype(napi_env env,
 
 napi_status NAPI_CDECL napi_create_object(napi_env env, napi_value* result) {
   CHECK_ENV(env);
-  CHECK_ARG(env, result);
   env->CheckGCAccess();
+  CHECK_ARG(env, result);
 
   *result = v8impl::JsValueFromV8LocalValue(v8::Object::New(env->isolate));
 
@@ -1549,8 +1544,8 @@ napi_status NAPI_CDECL napi_create_object(napi_env env, napi_value* result) {
 
 napi_status NAPI_CDECL napi_create_array(napi_env env, napi_value* result) {
   CHECK_ENV(env);
-  CHECK_ARG(env, result);
   env->CheckGCAccess();
+  CHECK_ARG(env, result);
 
   *result = v8impl::JsValueFromV8LocalValue(v8::Array::New(env->isolate));
 
@@ -1561,8 +1556,8 @@ napi_status NAPI_CDECL napi_create_array_with_length(napi_env env,
                                                      size_t length,
                                                      napi_value* result) {
   CHECK_ENV(env);
-  CHECK_ARG(env, result);
   env->CheckGCAccess();
+  CHECK_ARG(env, result);
 
   *result =
       v8impl::JsValueFromV8LocalValue(v8::Array::New(env->isolate, length));
@@ -1662,8 +1657,8 @@ napi_status NAPI_CDECL napi_create_double(napi_env env,
                                           double value,
                                           napi_value* result) {
   CHECK_ENV(env);
-  CHECK_ARG(env, result);
   env->CheckGCAccess();
+  CHECK_ARG(env, result);
 
   *result =
       v8impl::JsValueFromV8LocalValue(v8::Number::New(env->isolate, value));
@@ -1675,8 +1670,8 @@ napi_status NAPI_CDECL napi_create_int32(napi_env env,
                                          int32_t value,
                                          napi_value* result) {
   CHECK_ENV(env);
-  CHECK_ARG(env, result);
   env->CheckGCAccess();
+  CHECK_ARG(env, result);
 
   *result =
       v8impl::JsValueFromV8LocalValue(v8::Integer::New(env->isolate, value));
@@ -1688,8 +1683,8 @@ napi_status NAPI_CDECL napi_create_uint32(napi_env env,
                                           uint32_t value,
                                           napi_value* result) {
   CHECK_ENV(env);
-  CHECK_ARG(env, result);
   env->CheckGCAccess();
+  CHECK_ARG(env, result);
 
   *result = v8impl::JsValueFromV8LocalValue(
       v8::Integer::NewFromUnsigned(env->isolate, value));
@@ -1701,8 +1696,8 @@ napi_status NAPI_CDECL napi_create_int64(napi_env env,
                                          int64_t value,
                                          napi_value* result) {
   CHECK_ENV(env);
-  CHECK_ARG(env, result);
   env->CheckGCAccess();
+  CHECK_ARG(env, result);
 
   *result = v8impl::JsValueFromV8LocalValue(
       v8::Number::New(env->isolate, static_cast<double>(value)));
@@ -1714,8 +1709,8 @@ napi_status NAPI_CDECL napi_create_bigint_int64(napi_env env,
                                                 int64_t value,
                                                 napi_value* result) {
   CHECK_ENV(env);
-  CHECK_ARG(env, result);
   env->CheckGCAccess();
+  CHECK_ARG(env, result);
 
   *result =
       v8impl::JsValueFromV8LocalValue(v8::BigInt::New(env->isolate, value));
@@ -1727,8 +1722,8 @@ napi_status NAPI_CDECL napi_create_bigint_uint64(napi_env env,
                                                  uint64_t value,
                                                  napi_value* result) {
   CHECK_ENV(env);
-  CHECK_ARG(env, result);
   env->CheckGCAccess();
+  CHECK_ARG(env, result);
 
   *result = v8impl::JsValueFromV8LocalValue(
       v8::BigInt::NewFromUnsigned(env->isolate, value));
@@ -1742,9 +1737,9 @@ napi_status NAPI_CDECL napi_create_bigint_words(napi_env env,
                                                 const uint64_t* words,
                                                 napi_value* result) {
   NAPI_PREAMBLE(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, words);
   CHECK_ARG(env, result);
-  env->CheckGCAccess();
 
   v8::Local<v8::Context> context = env->context();
 
@@ -1763,8 +1758,8 @@ napi_status NAPI_CDECL napi_get_boolean(napi_env env,
                                         bool value,
                                         napi_value* result) {
   CHECK_ENV(env);
-  CHECK_ARG(env, result);
   env->CheckGCAccess();
+  CHECK_ARG(env, result);
 
   v8::Isolate* isolate = env->isolate;
 
@@ -1781,8 +1776,8 @@ napi_status NAPI_CDECL napi_create_symbol(napi_env env,
                                           napi_value description,
                                           napi_value* result) {
   CHECK_ENV(env);
-  CHECK_ARG(env, result);
   env->CheckGCAccess();
+  CHECK_ARG(env, result);
 
   v8::Isolate* isolate = env->isolate;
 
@@ -1804,8 +1799,8 @@ napi_status NAPI_CDECL node_api_symbol_for(napi_env env,
                                            size_t length,
                                            napi_value* result) {
   CHECK_ENV(env);
-  CHECK_ARG(env, result);
   env->CheckGCAccess();
+  CHECK_ARG(env, result);
 
   napi_value js_description_string;
   STATUS_CALL(napi_create_string_utf8(
@@ -1850,9 +1845,9 @@ napi_status NAPI_CDECL napi_create_error(napi_env env,
                                          napi_value msg,
                                          napi_value* result) {
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, msg);
   CHECK_ARG(env, result);
-  env->CheckGCAccess();
 
   v8::Local<v8::Value> message_value = v8impl::V8LocalValueFromJsValue(msg);
   RETURN_STATUS_IF_FALSE(env, message_value->IsString(), napi_string_expected);
@@ -1871,9 +1866,9 @@ napi_status NAPI_CDECL napi_create_type_error(napi_env env,
                                               napi_value msg,
                                               napi_value* result) {
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, msg);
   CHECK_ARG(env, result);
-  env->CheckGCAccess();
 
   v8::Local<v8::Value> message_value = v8impl::V8LocalValueFromJsValue(msg);
   RETURN_STATUS_IF_FALSE(env, message_value->IsString(), napi_string_expected);
@@ -1892,9 +1887,9 @@ napi_status NAPI_CDECL napi_create_range_error(napi_env env,
                                                napi_value msg,
                                                napi_value* result) {
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, msg);
   CHECK_ARG(env, result);
-  env->CheckGCAccess();
 
   v8::Local<v8::Value> message_value = v8impl::V8LocalValueFromJsValue(msg);
   RETURN_STATUS_IF_FALSE(env, message_value->IsString(), napi_string_expected);
@@ -1913,9 +1908,9 @@ napi_status NAPI_CDECL node_api_create_syntax_error(napi_env env,
                                                     napi_value msg,
                                                     napi_value* result) {
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, msg);
   CHECK_ARG(env, result);
-  env->CheckGCAccess();
 
   v8::Local<v8::Value> message_value = v8impl::V8LocalValueFromJsValue(msg);
   RETURN_STATUS_IF_FALSE(env, message_value->IsString(), napi_string_expected);
@@ -1935,6 +1930,7 @@ napi_status NAPI_CDECL napi_typeof(napi_env env,
   // Omit NAPI_PREAMBLE and GET_RETURN_STATUS because V8 calls here cannot throw
   // JS exceptions.
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, value);
   CHECK_ARG(env, result);
 
@@ -1974,6 +1970,7 @@ napi_status NAPI_CDECL napi_typeof(napi_env env,
 
 napi_status NAPI_CDECL napi_get_undefined(napi_env env, napi_value* result) {
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, result);
 
   *result = v8impl::JsValueFromV8LocalValue(v8::Undefined(env->isolate));
@@ -1983,6 +1980,7 @@ napi_status NAPI_CDECL napi_get_undefined(napi_env env, napi_value* result) {
 
 napi_status NAPI_CDECL napi_get_null(napi_env env, napi_value* result) {
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, result);
 
   *result = v8impl::JsValueFromV8LocalValue(v8::Null(env->isolate));
@@ -2074,6 +2072,7 @@ napi_status NAPI_CDECL napi_call_function(napi_env env,
 
 napi_status NAPI_CDECL napi_get_global(napi_env env, napi_value* result) {
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, result);
 
   *result = v8impl::JsValueFromV8LocalValue(env->context()->Global());
@@ -2171,6 +2170,7 @@ napi_status NAPI_CDECL napi_is_error(napi_env env,
   // Omit NAPI_PREAMBLE and GET_RETURN_STATUS because V8 calls here cannot
   // throw JS exceptions.
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, value);
   CHECK_ARG(env, result);
 
@@ -2186,6 +2186,7 @@ napi_status NAPI_CDECL napi_get_value_double(napi_env env,
   // Omit NAPI_PREAMBLE and GET_RETURN_STATUS because V8 calls here cannot throw
   // JS exceptions.
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, value);
   CHECK_ARG(env, result);
 
@@ -2203,6 +2204,7 @@ napi_status NAPI_CDECL napi_get_value_int32(napi_env env,
   // Omit NAPI_PREAMBLE and GET_RETURN_STATUS because V8 calls here cannot throw
   // JS exceptions.
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, value);
   CHECK_ARG(env, result);
 
@@ -2227,6 +2229,7 @@ napi_status NAPI_CDECL napi_get_value_uint32(napi_env env,
   // Omit NAPI_PREAMBLE and GET_RETURN_STATUS because V8 calls here cannot throw
   // JS exceptions.
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, value);
   CHECK_ARG(env, result);
 
@@ -2251,6 +2254,7 @@ napi_status NAPI_CDECL napi_get_value_int64(napi_env env,
   // Omit NAPI_PREAMBLE and GET_RETURN_STATUS because V8 calls here cannot throw
   // JS exceptions.
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, value);
   CHECK_ARG(env, result);
 
@@ -2284,6 +2288,7 @@ napi_status NAPI_CDECL napi_get_value_bigint_int64(napi_env env,
                                                    int64_t* result,
                                                    bool* lossless) {
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, value);
   CHECK_ARG(env, result);
   CHECK_ARG(env, lossless);
@@ -2302,6 +2307,7 @@ napi_status NAPI_CDECL napi_get_value_bigint_uint64(napi_env env,
                                                     uint64_t* result,
                                                     bool* lossless) {
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, value);
   CHECK_ARG(env, result);
   CHECK_ARG(env, lossless);
@@ -2321,6 +2327,7 @@ napi_status NAPI_CDECL napi_get_value_bigint_words(napi_env env,
                                                    size_t* word_count,
                                                    uint64_t* words) {
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, value);
   CHECK_ARG(env, word_count);
 
@@ -2351,6 +2358,7 @@ napi_status NAPI_CDECL napi_get_value_bool(napi_env env,
   // Omit NAPI_PREAMBLE and GET_RETURN_STATUS because V8 calls here cannot throw
   // JS exceptions.
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, value);
   CHECK_ARG(env, result);
 
@@ -2373,6 +2381,7 @@ napi_status NAPI_CDECL napi_get_value_bool(napi_env env,
 napi_status NAPI_CDECL napi_get_value_string_latin1(
     napi_env env, napi_value value, char* buf, size_t bufsize, size_t* result) {
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, value);
 
   v8::Local<v8::Value> val = v8impl::V8LocalValueFromJsValue(value);
@@ -2411,6 +2420,7 @@ napi_status NAPI_CDECL napi_get_value_string_latin1(
 napi_status NAPI_CDECL napi_get_value_string_utf8(
     napi_env env, napi_value value, char* buf, size_t bufsize, size_t* result) {
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, value);
 
   v8::Local<v8::Value> val = v8impl::V8LocalValueFromJsValue(value);
@@ -2452,6 +2462,7 @@ napi_status NAPI_CDECL napi_get_value_string_utf16(napi_env env,
                                                    size_t bufsize,
                                                    size_t* result) {
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, value);
 
   v8::Local<v8::Value> val = v8impl::V8LocalValueFromJsValue(value);
@@ -2638,6 +2649,7 @@ napi_status NAPI_CDECL napi_get_value_external(napi_env env,
                                                napi_value value,
                                                void** result) {
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, value);
   CHECK_ARG(env, result);
 
@@ -2658,6 +2670,7 @@ napi_status NAPI_CDECL napi_create_reference(napi_env env,
   // Omit NAPI_PREAMBLE and GET_RETURN_STATUS because V8 calls here cannot throw
   // JS exceptions.
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, value);
   CHECK_ARG(env, result);
 
@@ -2682,6 +2695,7 @@ napi_status NAPI_CDECL napi_delete_reference(napi_env env, napi_ref ref) {
   // Omit NAPI_PREAMBLE and GET_RETURN_STATUS because V8 calls here cannot throw
   // JS exceptions.
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, ref);
 
   delete reinterpret_cast<v8impl::Reference*>(ref);
@@ -2700,6 +2714,7 @@ napi_status NAPI_CDECL napi_reference_ref(napi_env env,
   // Omit NAPI_PREAMBLE and GET_RETURN_STATUS because V8 calls here cannot throw
   // JS exceptions.
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, ref);
 
   v8impl::Reference* reference = reinterpret_cast<v8impl::Reference*>(ref);
@@ -2722,6 +2737,7 @@ napi_status NAPI_CDECL napi_reference_unref(napi_env env,
   // Omit NAPI_PREAMBLE and GET_RETURN_STATUS because V8 calls here cannot throw
   // JS exceptions.
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, ref);
 
   v8impl::Reference* reference = reinterpret_cast<v8impl::Reference*>(ref);
@@ -2748,6 +2764,7 @@ napi_status NAPI_CDECL napi_get_reference_value(napi_env env,
   // Omit NAPI_PREAMBLE and GET_RETURN_STATUS because V8 calls here cannot throw
   // JS exceptions.
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, ref);
   CHECK_ARG(env, result);
 
@@ -2762,6 +2779,7 @@ napi_status NAPI_CDECL napi_open_handle_scope(napi_env env,
   // Omit NAPI_PREAMBLE and GET_RETURN_STATUS because V8 calls here cannot throw
   // JS exceptions.
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, result);
 
   *result = v8impl::JsHandleScopeFromV8HandleScope(
@@ -2775,6 +2793,7 @@ napi_status NAPI_CDECL napi_close_handle_scope(napi_env env,
   // Omit NAPI_PREAMBLE and GET_RETURN_STATUS because V8 calls here cannot throw
   // JS exceptions.
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, scope);
   if (env->open_handle_scopes == 0) {
     return napi_handle_scope_mismatch;
@@ -2790,6 +2809,7 @@ napi_status NAPI_CDECL napi_open_escapable_handle_scope(
   // Omit NAPI_PREAMBLE and GET_RETURN_STATUS because V8 calls here cannot throw
   // JS exceptions.
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, result);
 
   *result = v8impl::JsEscapableHandleScopeFromV8EscapableHandleScope(
@@ -2803,6 +2823,7 @@ napi_status NAPI_CDECL napi_close_escapable_handle_scope(
   // Omit NAPI_PREAMBLE and GET_RETURN_STATUS because V8 calls here cannot throw
   // JS exceptions.
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, scope);
   if (env->open_handle_scopes == 0) {
     return napi_handle_scope_mismatch;
@@ -2820,6 +2841,7 @@ napi_status NAPI_CDECL napi_escape_handle(napi_env env,
   // Omit NAPI_PREAMBLE and GET_RETURN_STATUS because V8 calls here cannot throw
   // JS exceptions.
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, scope);
   CHECK_ARG(env, escapee);
   CHECK_ARG(env, result);
@@ -2898,6 +2920,7 @@ napi_status NAPI_CDECL napi_is_exception_pending(napi_env env, bool* result) {
   // NAPI_PREAMBLE is not used here: this function must execute when there is a
   // pending exception.
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, result);
 
   *result = !env->last_exception.IsEmpty();
@@ -2909,6 +2932,7 @@ napi_status NAPI_CDECL napi_get_and_clear_last_exception(napi_env env,
   // NAPI_PREAMBLE is not used here: this function must execute when there is a
   // pending exception.
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, result);
 
   if (env->last_exception.IsEmpty()) {
@@ -2926,6 +2950,7 @@ napi_status NAPI_CDECL napi_is_arraybuffer(napi_env env,
                                            napi_value value,
                                            bool* result) {
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, value);
   CHECK_ARG(env, result);
 
@@ -2978,6 +3003,7 @@ napi_status NAPI_CDECL napi_get_arraybuffer_info(napi_env env,
                                                  void** data,
                                                  size_t* byte_length) {
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, arraybuffer);
 
   v8::Local<v8::Value> value = v8impl::V8LocalValueFromJsValue(arraybuffer);
@@ -3000,6 +3026,7 @@ napi_status NAPI_CDECL napi_is_typedarray(napi_env env,
                                           napi_value value,
                                           bool* result) {
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, value);
   CHECK_ARG(env, result);
 
@@ -3086,6 +3113,7 @@ napi_status NAPI_CDECL napi_get_typedarray_info(napi_env env,
                                                 napi_value* arraybuffer,
                                                 size_t* byte_offset) {
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, typedarray);
 
   v8::Local<v8::Value> value = v8impl::V8LocalValueFromJsValue(typedarray);
@@ -3176,6 +3204,7 @@ napi_status NAPI_CDECL napi_is_dataview(napi_env env,
                                         napi_value value,
                                         bool* result) {
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, value);
   CHECK_ARG(env, result);
 
@@ -3192,6 +3221,7 @@ napi_status NAPI_CDECL napi_get_dataview_info(napi_env env,
                                               napi_value* arraybuffer,
                                               size_t* byte_offset) {
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, dataview);
 
   v8::Local<v8::Value> value = v8impl::V8LocalValueFromJsValue(dataview);
@@ -3267,6 +3297,7 @@ napi_status NAPI_CDECL napi_is_promise(napi_env env,
                                        napi_value value,
                                        bool* is_promise) {
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, value);
   CHECK_ARG(env, is_promise);
 
@@ -3293,6 +3324,7 @@ napi_status NAPI_CDECL napi_is_date(napi_env env,
                                     napi_value value,
                                     bool* is_date) {
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, value);
   CHECK_ARG(env, is_date);
 
@@ -3305,6 +3337,7 @@ napi_status NAPI_CDECL napi_get_date_value(napi_env env,
                                            napi_value value,
                                            double* result) {
   NAPI_PREAMBLE(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, value);
   CHECK_ARG(env, result);
 
@@ -3351,6 +3384,7 @@ napi_status NAPI_CDECL napi_add_finalizer(napi_env env,
   // Omit NAPI_PREAMBLE and GET_RETURN_STATUS because V8 calls here cannot throw
   // JS exceptions.
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, js_object);
   CHECK_ARG(env, finalize_cb);
 
@@ -3430,6 +3464,7 @@ napi_status NAPI_CDECL napi_get_instance_data(napi_env env, void** data) {
 napi_status NAPI_CDECL napi_detach_arraybuffer(napi_env env,
                                                napi_value arraybuffer) {
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, arraybuffer);
 
   v8::Local<v8::Value> value = v8impl::V8LocalValueFromJsValue(arraybuffer);
@@ -3449,6 +3484,7 @@ napi_status NAPI_CDECL napi_is_detached_arraybuffer(napi_env env,
                                                     napi_value arraybuffer,
                                                     bool* result) {
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, arraybuffer);
   CHECK_ARG(env, result);
 
diff --git a/src/js_native_api_v8.h b/src/js_native_api_v8.h
index 3c58b84c749360..1e851389f0bba4 100644
--- a/src/js_native_api_v8.h
+++ b/src/js_native_api_v8.h
@@ -228,9 +228,9 @@ inline napi_status napi_set_last_error(napi_env env,
 // NAPI_PREAMBLE is not wrapped in do..while: try_catch must have function scope
 #define NAPI_PREAMBLE(env)                                                     \
   CHECK_ENV((env));                                                            \
+  (env)->CheckGCAccess();                                                      \
   RETURN_STATUS_IF_FALSE(                                                      \
       (env), (env)->last_exception.IsEmpty(), napi_pending_exception);         \
-  (env)->CheckGCAccess();                                                      \
   RETURN_STATUS_IF_FALSE((env),                                                \
                          (env)->can_call_into_js(),                            \
                          (env->module_api_version == NAPI_VERSION_EXPERIMENTAL \
diff --git a/src/node_api.cc b/src/node_api.cc
index 1f1cfb916a7f1e..409c235eceb1e1 100644
--- a/src/node_api.cc
+++ b/src/node_api.cc
@@ -914,6 +914,7 @@ napi_status NAPI_CDECL napi_async_init(napi_env env,
                                        napi_value async_resource_name,
                                        napi_async_context* result) {
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, async_resource_name);
   CHECK_ARG(env, result);
 
@@ -947,6 +948,7 @@ napi_status NAPI_CDECL napi_async_init(napi_env env,
 napi_status NAPI_CDECL napi_async_destroy(napi_env env,
                                           napi_async_context async_context) {
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, async_context);
 
   v8impl::AsyncContext* node_async_context =
@@ -1096,6 +1098,7 @@ napi_status NAPI_CDECL napi_is_buffer(napi_env env,
                                       napi_value value,
                                       bool* result) {
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, value);
   CHECK_ARG(env, result);
 
@@ -1108,6 +1111,7 @@ napi_status NAPI_CDECL napi_get_buffer_info(napi_env env,
                                             void** data,
                                             size_t* length) {
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, value);
 
   v8::Local<v8::Value> buffer = v8impl::V8LocalValueFromJsValue(value);
@@ -1229,6 +1233,7 @@ napi_create_async_work(napi_env env,
                        void* data,
                        napi_async_work* result) {
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, execute);
   CHECK_ARG(env, result);
 
@@ -1259,6 +1264,7 @@ napi_create_async_work(napi_env env,
 napi_status NAPI_CDECL napi_delete_async_work(napi_env env,
                                               napi_async_work work) {
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, work);
 
   uvimpl::Work::Delete(reinterpret_cast<uvimpl::Work*>(work));
@@ -1313,6 +1319,7 @@ napi_create_threadsafe_function(napi_env env,
                                 napi_threadsafe_function_call_js call_js_cb,
                                 napi_threadsafe_function* result) {
   CHECK_ENV(env);
+  env->CheckGCAccess();
   CHECK_ARG(env, async_resource_name);
   RETURN_STATUS_IF_FALSE(env, initial_thread_count > 0, napi_invalid_arg);
   CHECK_ARG(env, result);
diff --git a/test/js-native-api/test_finalizer/test_finalizer.c b/test/js-native-api/test_finalizer/test_finalizer.c
index 74de20254b81b3..d7394674331d73 100644
--- a/test/js-native-api/test_finalizer/test_finalizer.c
+++ b/test/js-native-api/test_finalizer/test_finalizer.c
@@ -14,7 +14,12 @@ static void finalizerOnlyCallback(napi_env env,
                                   void* finalize_data,
                                   void* finalize_hint) {
   FinalizerData* data = (FinalizerData*)finalize_data;
-  ++data->finalize_count;
+  int32_t count = ++data->finalize_count;
+
+  // It is safe to access instance data
+  NODE_API_CALL_RETURN_VOID(env, napi_get_instance_data(env, &data));
+  NODE_API_ASSERT(
+      env, count = data->finalize_count, "Expected to the same FinalizerData");
 }
 
 static void finalizerCallingJSCallback(napi_env env,