diff --git a/misc/jenkins/build_simulator.bat b/misc/jenkins/build_simulator.bat
index 59f99ab8d1..0c5a120945 100644
--- a/misc/jenkins/build_simulator.bat
+++ b/misc/jenkins/build_simulator.bat
@@ -9,3 +9,4 @@ rm -rf .dep
 call compile.bat
 cd ..
 if not exist simulator/build/rusefi_simulator.exe echo SIMULATOR COMPILATION FAILED
+if not exist simulator/build/rusefi_simulator.exe exit -1
diff --git a/misc/jenkins/compile_other_versions/compile_and_upload.bat b/misc/jenkins/compile_other_versions/compile_and_upload.bat
index ad73d81aef..965eb0aa21 100644
--- a/misc/jenkins/compile_other_versions/compile_and_upload.bat
+++ b/misc/jenkins/compile_other_versions/compile_and_upload.bat
@@ -36,6 +36,6 @@ cd ..
 rem We are back at root rusEfi folder
 pwd
 
-call misc\jenkins\compile_other_versions\build_version.bat
+call misc\jenkins\compile_other_versions\prepare_bundle.bat
 
 echo "exiting %script_name%"
diff --git a/misc/jenkins/compile_other_versions/build_version.bat b/misc/jenkins/compile_other_versions/prepare_bundle.bat
similarity index 89%
rename from misc/jenkins/compile_other_versions/build_version.bat
rename to misc/jenkins/compile_other_versions/prepare_bundle.bat
index b44d11e40d..c6fee5afe0 100644
--- a/misc/jenkins/compile_other_versions/build_version.bat
+++ b/misc/jenkins/compile_other_versions/prepare_bundle.bat
@@ -1,6 +1,10 @@
 set script_name=build_version.bat
 echo Entering %script_name% with %bundle_name%
 
+if %RUSEFI_BUILD_FTP_USER%.==. (
+    echo RUSEFI_BUILD_FTP_USER not set - not packaging
+    exit 0
+)
 
 rm -rf temp
 rem This depends on Cygwin date copied under 'datecyg' name to avoid conflict with Windows date