diff --git a/tools/install/win/build-fpc.bat b/tools/install/win/build-fpc.bat
index f261d813d6..51b54e531e 100644
--- a/tools/install/win/build-fpc.bat
+++ b/tools/install/win/build-fpc.bat
@@ -38,7 +38,7 @@ SET INSTALL_BASE=%BUILDDIR%\fpc\%FPCVERSION%
 SET INSTALL_BINDIR=%INSTALL_BASE%\bin\%FPCFULLTARGET%
 
 SET FPCMAKE=%SOURCE_DIR%\utils\fpcm\bin\%FPCFULLTARGET%\fpcmake.exe
-IF ("%FPCVERSION:~0,3%" == "2.6") SET FPCMAKE=%SOURCE_DIR%\utils\fpcm\fpcmake.exe
+IF "%FPCVERSION:~0,3%" == "2.6" SET FPCMAKE=%SOURCE_DIR%\utils\fpcm\fpcmake.exe
 
 %MAKEEXE% compiler_install rtl_install packages_install utils_install INSTALL_PREFIX=%INSTALL_BASE% PP=%COMPILER% FPCMAKE=%FPCMAKE% >> %LOGFILE%
 
diff --git a/tools/install/win/create_installer.bat b/tools/install/win/create_installer.bat
index 94bcb8d2ae..c2bf30cc81 100644
--- a/tools/install/win/create_installer.bat
+++ b/tools/install/win/create_installer.bat
@@ -149,6 +149,7 @@ del %INSTALL_BINDIR%\gdb.exe
 
 :: exit if no compiler has been made
 if not exist %INSTALL_BINDIR%\fpc.exe goto WARNING_NO_COMPILER_MADE
+if not exist %INSTALL_BINDIR%\fpcmkcfg.exe goto WARNING_NO_COMPILER_MADE
 
 %INSTALL_BINDIR%\fpcmkcfg.exe -d "basepath=%INSTALL_BASE%" -o %INSTALL_BINDIR%\fpc.cfg