diff --git a/packages/devtools-launchpad/src/index.js b/packages/devtools-launchpad/src/index.js
index 27aa4c5be..98b131855 100644
--- a/packages/devtools-launchpad/src/index.js
+++ b/packages/devtools-launchpad/src/index.js
@@ -180,10 +180,15 @@ async function getTabs(actions) {
 async function bootstrap(React, ReactDOM) {
   const connTarget = getTargetFromQuery();
   if (connTarget) {
-    const { tab, tabConnection } = await startDebugging(connTarget);
-
-    await updateConfig();
-    return { tab, connTarget, tabConnection };
+    const debuggedTarget = await startDebugging(connTarget);
+
+    if (debuggedTarget) {
+      const { tab, tabConnection } = debuggedTarget;
+      await updateConfig();
+      return { tab, connTarget, tabConnection };
+    } else {
+      console.info("Tab closed due to missing debugged target window.")
+    }
   }
 
   const { store, actions, LaunchpadApp } = await initApp();