diff --git a/autoload/vimspector/internal/neojob.vim b/autoload/vimspector/internal/neojob.vim
index 2a87c4c..4c7abbb 100644
--- a/autoload/vimspector/internal/neojob.vim
+++ b/autoload/vimspector/internal/neojob.vim
@@ -30,7 +30,9 @@ function! s:_OnEvent( chan_id, data, event ) abort
   elseif a:event ==# 'exit'
     echom 'Channel exit with status ' . a:data
     redraw
-    unlet s:job
+    if exists( 's:job' )
+      unlet s:job
+    endif
     " This causes terminal spam in neovim due to
     " https://github.com/neovim/neovim/issues/11725
     py3 _vimspector_session.OnServerExit( vim.eval( 'a:data' ) )
diff --git a/autoload/vimspector/internal/neoterm.vim b/autoload/vimspector/internal/neoterm.vim
index 627f570..f36c0db 100644
--- a/autoload/vimspector/internal/neoterm.vim
+++ b/autoload/vimspector/internal/neoterm.vim
@@ -28,10 +28,9 @@ let s:buffer_to_id = {}
 function! vimspector#internal#neoterm#PrepareEnvironment( env ) abort
   let old_env = {}
 
-  let new_env = copy( environ() )
   for key in keys( a:env )
-    if has_key( new_env, key )
-      let old_env[ key ] = new_env[ key ]
+    if exists( '$' . key )
+      let old_env[ key ] = getenv( key )
     endif
     call setenv( key, a:env[ key ] )
   endfor