diff --git a/macos/Ghostty.xcodeproj/project.pbxproj b/macos/Ghostty.xcodeproj/project.pbxproj
index 2125520ef6..269599c150 100644
--- a/macos/Ghostty.xcodeproj/project.pbxproj
+++ b/macos/Ghostty.xcodeproj/project.pbxproj
@@ -254,6 +254,7 @@
 				Helpers/PermissionRequest.swift,
 				Helpers/Private/CGS.swift,
 				Helpers/Private/Dock.swift,
+				Helpers/ObjCExceptionCatcher.m,
 				Helpers/TabGroupCloseCoordinator.swift,
 				Helpers/TabTitleEditor.swift,
 				Helpers/VibrantLayer.m,
diff --git a/macos/Sources/Features/Terminal/TerminalController.swift b/macos/Sources/Features/Terminal/TerminalController.swift
index 843ee33095..f3dbcb56d8 100644
--- a/macos/Sources/Features/Terminal/TerminalController.swift
+++ b/macos/Sources/Features/Terminal/TerminalController.swift
@@ -890,7 +890,7 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
         if #available(macOS 26, *) {
             if window is TitlebarTabsTahoeTerminalWindow {
                 tabGroup.removeWindow(movingWindow)
-                targetWindow.addTabbedWindow(movingWindow, ordered: .below)
+                targetWindow.addTabbedWindowSafely(movingWindow, ordered: .below)
                 relabelTabs()
                 return
             }
@@ -899,7 +899,7 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
         NSAnimationContext.beginGrouping()
         NSAnimationContext.current.duration = 0
         tabGroup.removeWindow(movingWindow)
-        targetWindow.addTabbedWindow(movingWindow, ordered: .below)
+        targetWindow.addTabbedWindowSafely(movingWindow, ordered: .below)
         NSAnimationContext.endGrouping()
 
         relabelTabs()
@@ -915,7 +915,7 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
         if #available(macOS 26, *) {
             if window is TitlebarTabsTahoeTerminalWindow {
                 tabGroup.removeWindow(movingWindow)
-                targetWindow.addTabbedWindow(movingWindow, ordered: .above)
+                targetWindow.addTabbedWindowSafely(movingWindow, ordered: .above)
                 relabelTabs()
                 return
             }
@@ -924,7 +924,7 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
         NSAnimationContext.beginGrouping()
         NSAnimationContext.current.duration = 0
         tabGroup.removeWindow(movingWindow)
-        targetWindow.addTabbedWindow(movingWindow, ordered: .above)
+        targetWindow.addTabbedWindowSafely(movingWindow, ordered: .above)
         NSAnimationContext.endGrouping()
 
         relabelTabs()