diff --git a/python3/vimspector/output.py b/python3/vimspector/output.py
index 4b89d95..4cd7c64 100644
--- a/python3/vimspector/output.py
+++ b/python3/vimspector/output.py
@@ -186,6 +186,9 @@ class OutputView( object ):
           self._RenderWinBar( category )
 
   def _RenderWinBar( self, category ):
+    if not self._window.valid:
+      return
+
     tab_buffer = self._buffers[ category ]
 
     try:
diff --git a/python3/vimspector/utils.py b/python3/vimspector/utils.py
index cf4a69d..d2870c6 100644
--- a/python3/vimspector/utils.py
+++ b/python3/vimspector/utils.py
@@ -195,9 +195,8 @@ def RestoreCurrentWindow():
   try:
     yield
   finally:
-    if old_tabpage.valid:
+    if old_tabpage.valid and old_window.valid:
       vim.current.tabpage = old_tabpage
-    if old_window.valid:
       vim.current.window = old_window