nodejs
diff --git a/Collapse file
‎src/env.cc‎
Copy file name to clipboardExpand all lines: src/env.cc
+7Lines changed: 7 additions & 0 deletions b/Collapse file
‎src/env.cc‎
Copy file name to clipboardExpand all lines: src/env.cc
+7Lines changed: 7 additions & 0 deletions
diff --git a/Collapse file
‎src/inspector_agent.cc‎
Copy file name to clipboardExpand all lines: src/inspector_agent.cc
+1Lines changed: 1 addition & 0 deletions b/Collapse file
‎src/inspector_agent.cc‎
Copy file name to clipboardExpand all lines: src/inspector_agent.cc
+1Lines changed: 1 addition & 0 deletions
diff --git a/Collapse file
‎src/inspector_js_api.cc‎
Copy file name to clipboardExpand all lines: src/inspector_js_api.cc
-6Lines changed: 0 additions & 6 deletions b/Collapse file
‎src/inspector_js_api.cc‎
Copy file name to clipboardExpand all lines: src/inspector_js_api.cc
-6Lines changed: 0 additions & 6 deletions
@@ -341,6 +341,13 @@ void Environment::Start(const std::vector<std::string>& args,
   static uv_once_t init_once = UV_ONCE_INIT;
   uv_once(&init_once, InitThreadLocalOnce);
   uv_key_set(&thread_local_env, this);
+
+#if HAVE_INSPECTOR
+  // This needs to be set before we start the inspector
+  Local<Object> obj = Object::New(isolate());
+  CHECK(obj->SetPrototype(context(), Null(isolate())).FromJust());
+  set_inspector_console_api_object(obj);
+#endif  // HAVE_INSPECTOR
 }
 
 void Environment::RegisterHandleCleanups() {
 
@@ -506,6 +506,7 @@ class NodeInspectorClient : public V8InspectorClient {
   void installAdditionalCommandLineAPI(Local<Context> context,
                                        Local<Object> target) override {
     Local<Object> console_api = env_->inspector_console_api_object();
+    CHECK(!console_api.IsEmpty());
 
     Local<Array> properties =
         console_api->GetOwnPropertyNames(context).ToLocalChecked();
 
@@ -277,12 +277,6 @@ void Url(const FunctionCallbackInfo<Value>& args) {
 void Initialize(Local<Object> target, Local<Value> unused,
                 Local<Context> context, void* priv) {
   Environment* env = Environment::GetCurrent(context);
-  {
-    auto obj = Object::New(env->isolate());
-    auto null = Null(env->isolate());
-    CHECK(obj->SetPrototype(context, null).FromJust());
-    env->set_inspector_console_api_object(obj);
-  }
 
   Agent* agent = env->inspector_agent();
   env->SetMethod(target, "consoleCall", InspectorConsoleCall);