Index: Setup/build.bat
==================================================================
--- Setup/build.bat
+++ Setup/build.bat
@@ -266,12 +266,12 @@
 )
 
 GOTO no_errors
 
 :fn_UnquoteVariable
-  SETLOCAL
   IF NOT DEFINED %1 GOTO :EOF
+  SETLOCAL
   SET __ECHO_CMD=ECHO %%%1%%
   FOR /F "delims=" %%V IN ('%__ECHO_CMD%') DO (
     SET VALUE=%%V
   )
   SET VALUE=%VALUE:"=%

Index: Setup/release.bat
==================================================================
--- Setup/release.bat
+++ Setup/release.bat
@@ -209,12 +209,12 @@
     SET %1=%VALUE%
   )
   GOTO :EOF
 
 :fn_UnquoteVariable
-  SETLOCAL
   IF NOT DEFINED %1 GOTO :EOF
+  SETLOCAL
   SET __ECHO_CMD=ECHO %%%1%%
   FOR /F "delims=" %%V IN ('%__ECHO_CMD%') DO (
     SET VALUE=%%V
   )
   SET VALUE=%VALUE:"=%