1 files changed, 2 insertions, 0 deletions
diff --git a/src/env-inl.h b/src/env-inl.h
index 6c4120fc2e..2a560f71d2 100644
--- a/src/env-inl.h
+++ b/src/env-inl.h
@@ -296,6 +296,8 @@ inline void Environment::AssignToContext(v8::Local<v8::Context> context,
 }
 
 inline Environment* Environment::GetCurrent(v8::Isolate* isolate) {
+  if (UNLIKELY(!isolate->InContext())) return nullptr;
+  v8::HandleScope handle_scope(isolate);
   return GetCurrent(isolate->GetCurrentContext());
 }