diff --git a/misc/jenkins/build_working_folder.bat b/misc/jenkins/build_working_folder.bat
index eb4cd690b7..d023453495 100644
--- a/misc/jenkins/build_working_folder.bat
+++ b/misc/jenkins/build_working_folder.bat
@@ -12,7 +12,7 @@ ls -l %folder%
 
 wget https://rusefi.com/build_server/st_files/silent_st_drivers.exe drivers -P %drivers_folder%
 if not exist %drivers_folder%/silent_st_drivers.exe (
- echo ERROR DOWNLOADING silent_st_drivers.exe
+ echo %script_name%: ERROR DOWNLOADING silent_st_drivers.exe
  EXIT /B 1
 )
 
diff --git a/misc/jenkins/functional_test_and_build_bundle/build_current_bundle.bat b/misc/jenkins/functional_test_and_build_bundle/build_current_bundle.bat
index f2fe995005..e148d1e4d1 100644
--- a/misc/jenkins/functional_test_and_build_bundle/build_current_bundle.bat
+++ b/misc/jenkins/functional_test_and_build_bundle/build_current_bundle.bat
@@ -81,6 +81,10 @@ echo "folder variable=%folder%"
 
 pwd
 call misc\jenkins\build_working_folder.bat
+IF NOT ERRORLEVEL 0 (
+ echo %script_name%: ERROR invoking build_working_folder.bat
+ EXIT /B 1
+)
 
 echo "%script_name%: Building only console"
 pwd