diff --git a/Tools.bat b/Tools.bat
index 2bde909..1f266ad 100644
--- a/Tools.bat
+++ b/Tools.bat
@@ -1,7 +1,4 @@
 @ECHO OFF
-:: Retrieve Garry's Mod path from Regristry
-:: FOR /F "tokens=2* delims= " %%A IN ('REG QUERY "HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Steam App 4000" /v InstallLocation') DO SET "GARRYSMODPATH=%%B"
-SET "GARRYSMODPATH=C:\Program Files (x86)\Steam\steamapps\common\GarrysMod"
-
+call env.win.bat
 SET "PATH=%CD%;%GARRYSMODPATH%\bin;%PATH%"
-CMD
+CMD
\ No newline at end of file
diff --git a/Workshop Package.bat b/Workshop Package.bat
index 2988659..3c74e24 100644
--- a/Workshop Package.bat	
+++ b/Workshop Package.bat	
@@ -1,9 +1,4 @@
 @ECHO OFF
-:: Fallback
-SET "GARRYSMODPATH=C:\Program Files (x86)\Steam\steamapps\common\GarrysMod"
-
-:: Retrieve Garry's Mod path from Regristry
-FOR /F "tokens=2* delims= " %%A IN ('REG QUERY "HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Steam App 4000" /v InstallLocation') DO SET "GARRYSMODPATH=%%B"
-
+call env.win.bat
 "%GARRYSMODPATH%\bin\gmad.exe" create -folder "%CD%\Source" -out "%CD%\Pack.gma"
 PAUSE
\ No newline at end of file
diff --git a/Workshop Update.bat b/Workshop Update.bat
index 48f766d..6c49724 100644
--- a/Workshop Update.bat	
+++ b/Workshop Update.bat	
@@ -1,7 +1,4 @@
 @ECHO OFF
-:: Fallback
-SET "GARRYSMODPATH=C:\Program Files (x86)\Steam\steamapps\common\GarrysMod"
-
-REM "%GARRYSMODPATH%\bin\gmpublish.exe" update -id 468149739
+call env.win.bat
 "%GARRYSMODPATH%\bin\gmpublish.exe" update -id 468149739 -icon "Logo.jpg" -addon "Pack.gma" -changes ""
 PAUSE
\ No newline at end of file
diff --git a/env.win.bat b/env.win.bat
new file mode 100644
index 0000000..4ee491f
--- /dev/null
+++ b/env.win.bat
@@ -0,0 +1,11 @@
+@ECHO OFF
+
+:: Garry's Mod
+SET "GARRYSMODPATH=C:\Program Files (x86)\Steam\steamapps\common\GarrysMod"
+FOR /F "tokens=2* delims= " %%A IN ('REG QUERY "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Steam App 4000" /v InstallLocation') DO SET "GARRYSMODPATH=%%B"
+IF "%GARRYSMODPATH%" == "" (
+	FOR /F "tokens=2* delims= " %%A IN ('REG QUERY "HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Steam App 4000" /v InstallLocation') DO SET "GARRYSMODPATH=%%B"
+)
+IF "%GARRYSMODPATH%" == "" (
+	ECHO Failed to figure out where Garry's Mod is installed.
+)