diff --git a/Installer/merge_builds.cmd b/Installer/merge_builds.cmd
index 9648f1486e..b8b144abe3 100644
--- a/Installer/merge_builds.cmd
+++ b/Installer/merge_builds.cmd
@@ -1,4 +1,4 @@
-REM @ECHO OFF
+@ECHO OFF
 
 call %~dp0get_openssl.cmd
 
diff --git a/SandboxiePlus/qmake_plus.cmd b/SandboxiePlus/qmake_plus.cmd
index a86db28719..45ed9edd04 100644
--- a/SandboxiePlus/qmake_plus.cmd
+++ b/SandboxiePlus/qmake_plus.cmd
@@ -21,15 +21,17 @@ cd %~dp0\Build_qtsingleapp_%build_arch%
 
 %qt_path%\bin\qmake.exe %~dp0\QtSingleApp\qtsingleapp\qtsingleapp\qtsingleapp.qc.pro -spec win32-msvc "CONFIG+=qtquickcompiler"
 %~dp0..\..\Qt\Tools\QtCreator\bin\jom.exe -f Makefile.Release -j 8
-IF %ERRORLEVEL% NEQ 0 goto :eof
-
+IF %ERRORLEVEL% NEQ 0 goto :error
+if NOT EXIST %~dp0\bin\%build_arch%\Release\qtsingleapp.dll goto :error
 
 mkdir %~dp0\Build_MiscHelpers_%build_arch%
 cd %~dp0\Build_MiscHelpers_%build_arch%
 
+
 %qt_path%\bin\qmake.exe %~dp0\MiscHelpers\MiscHelpers.qc.pro -spec win32-msvc "CONFIG+=qtquickcompiler"
 %~dp0..\..\Qt\Tools\QtCreator\bin\jom.exe -f Makefile.Release -j 8
-IF %ERRORLEVEL% NEQ 0 goto :eof
+IF %ERRORLEVEL% NEQ 0 goto :error
+if NOT EXIST %~dp0\bin\%build_arch%\Release\MiscHelpers.dll goto :error
 
 
 mkdir %~dp0\Build_QSbieAPI_%build_arch%
@@ -37,7 +39,8 @@ cd %~dp0\Build_QSbieAPI_%build_arch%
 
 %qt_path%\bin\qmake.exe %~dp0\QSbieAPI\QSbieAPI.qc.pro -spec win32-msvc "CONFIG+=qtquickcompiler"
 %~dp0..\..\Qt\Tools\QtCreator\bin\jom.exe -f Makefile.Release -j 8
-IF %ERRORLEVEL% NEQ 0 goto :eof
+IF %ERRORLEVEL% NEQ 0 goto :error
+if NOT EXIST %~dp0\bin\%build_arch%\Release\QSbieAPI.dll goto :error
 
 
 mkdir %~dp0\Build_SandMan_%build_arch%
@@ -45,8 +48,8 @@ cd %~dp0\Build_SandMan_%build_arch%
 
 %qt_path%\bin\qmake.exe %~dp0\SandMan\SandMan.qc.pro -spec win32-msvc "CONFIG+=qtquickcompiler"
 %~dp0..\..\Qt\Tools\QtCreator\bin\jom.exe -f Makefile.Release -j 8
-IF %ERRORLEVEL% NEQ 0 goto :eof
-
+IF %ERRORLEVEL% NEQ 0 goto :error
+if NOT EXIST %~dp0\bin\%build_arch%\Release\SandMan.exe goto :error
 
 cd %~dp0
 
@@ -54,3 +57,8 @@ rem dir .\bin
 rem dir .\bin\%build_arch%
 rem dir .\bin\%build_arch%\Release
 
+goto :eof
+
+:error
+echo Build failed
+exit 1