diff --git a/CMakePresets.json b/CMakePresets.json
index 14595a91..7d3ddccc 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -264,4 +264,4 @@
             "configuration": "Release"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/tools/lib/setup-common.bat b/tools/lib/setup-common.bat
index 42b3dc16..9ba510c2 100644
--- a/tools/lib/setup-common.bat
+++ b/tools/lib/setup-common.bat
@@ -34,4 +34,6 @@ pip install --upgrade -r "%script_dir%\..\..\requirements.txt"
 @call %script_dir%\run-cmake-configure.bat
 
 :: Deactivate Python Virtual Environment
-@call %venv_path%\Scripts\deactivate.bat
+@if defined venv_path (
+    call %venv_path%\Scripts\deactivate.bat
+)