diff --git a/make.bat b/make.bat
index 123c4df0..e6998589 100644
--- a/make.bat
+++ b/make.bat
@@ -5,12 +5,14 @@ set r2frida_version=5.9.0
 if "%PLATFORM%" == "x64" (set frida_os_arch=x86_64) else (set frida_os_arch=x86)
 set DEBUG=/O2
 
-if "%VSARCH%" == "" (
+cl
+if not %ERRORLEVEL%==0 (
+	echo Cannot find CL in path. Maybe run preconfigure.bat
+	exit /b 1
+) else if "%VSARCH%" == "" (
 	echo VSARCH not set, please run preconfigure.bat
 	exit /b 1
 )
-set
-set R2_BASE=""
 if exist radare2 (
 	set R2_BASE=%CD%\radare2
 ) else (
diff --git a/test/db/extras/version b/test/db/extras/version
index 34cea12b..aa82c5ea 100644
--- a/test/db/extras/version
+++ b/test/db/extras/version
@@ -4,7 +4,7 @@ CMDS=<<EOF
 :?V
 EOF
 EXPECT=<<EOF
-16.2.1
+16.2.5
 EOF
 RUN
 
@@ -14,7 +14,7 @@ CMDS=<<EOF
 : Frida.version
 EOF
 EXPECT=<<EOF
-16.2.1
+16.2.5
 EOF
 RUN