diff --git a/plugin/bin/x-pack/certgen.bat b/plugin/bin/x-pack/certgen.bat
index a7761b6db86..aaa89e00888 100644
--- a/plugin/bin/x-pack/certgen.bat
+++ b/plugin/bin/x-pack/certgen.bat
@@ -6,9 +6,9 @@ rem you may not use this file except in compliance with the Elastic License.
 
 setlocal enabledelayedexpansion
 
-call "%~dp0..\elasticsearch-env.bat"
+call "%~dp0..\elasticsearch-env.bat" || exit /b 1
 
-call "%~dp0x-pack-env.bat"
+call "%~dp0x-pack-env.bat" || exit /b 1
 
 %JAVA% ^
   %ES_JAVA_OPTS% ^
diff --git a/plugin/bin/x-pack/croneval.bat b/plugin/bin/x-pack/croneval.bat
index a814e070ee7..f279ba4c07c 100644
--- a/plugin/bin/x-pack/croneval.bat
+++ b/plugin/bin/x-pack/croneval.bat
@@ -6,9 +6,9 @@ rem you may not use this file except in compliance with the Elastic License.
 
 setlocal enabledelayedexpansion
 
-call "%~dp0..\elasticsearch-env.bat"
+call "%~dp0..\elasticsearch-env.bat" || exit /b 1
 
-call "%~dp0x-pack-env.bat"
+call "%~dp0x-pack-env.bat" || exit /b 1
 
 %JAVA% ^
   %ES_JAVA_OPTS% ^
diff --git a/plugin/bin/x-pack/extension.bat b/plugin/bin/x-pack/extension.bat
index 39149e4ccb5..12cb7ba2f7f 100644
--- a/plugin/bin/x-pack/extension.bat
+++ b/plugin/bin/x-pack/extension.bat
@@ -6,9 +6,9 @@ rem you may not use this file except in compliance with the Elastic License.
 
 setlocal enabledelayedexpansion
 
-call "%~dp0..\elasticsearch-env.bat"
+call "%~dp0..\elasticsearch-env.bat" || exit /b 1
 
-call "%~dp0x-pack-env.bat"
+call "%~dp0x-pack-env.bat" || exit /b 1
 
 %JAVA% ^
   %ES_JAVA_OPTS% ^
diff --git a/plugin/bin/x-pack/migrate.bat b/plugin/bin/x-pack/migrate.bat
index e513c4baa97..16c7e65863c 100644
--- a/plugin/bin/x-pack/migrate.bat
+++ b/plugin/bin/x-pack/migrate.bat
@@ -6,9 +6,9 @@ rem you may not use this file except in compliance with the Elastic License.
 
 setlocal enabledelayedexpansion
 
-call "%~dp0..\elasticsearch-env.bat"
+call "%~dp0..\elasticsearch-env.bat" || exit /b 1
 
-call "%~dp0x-pack-env.bat"
+call "%~dp0x-pack-env.bat" || exit /b 1
 
 %JAVA% ^
   %ES_JAVA_OPTS% ^
diff --git a/plugin/bin/x-pack/setup-passwords.bat b/plugin/bin/x-pack/setup-passwords.bat
index 9c532459381..160b8275353 100644
--- a/plugin/bin/x-pack/setup-passwords.bat
+++ b/plugin/bin/x-pack/setup-passwords.bat
@@ -6,9 +6,9 @@ rem you may not use this file except in compliance with the Elastic License.
 
 setlocal enabledelayedexpansion
 
-call "%~dp0..\elasticsearch-env.bat"
+call "%~dp0..\elasticsearch-env.bat" || exit /b 1
 
-call "%~dp0x-pack-env.bat"
+call "%~dp0x-pack-env.bat" || exit /b 1
 
 %JAVA% ^
   %ES_JAVA_OPTS% ^
diff --git a/plugin/bin/x-pack/syskeygen.bat b/plugin/bin/x-pack/syskeygen.bat
index 8b6bc9f7238..153b3d009d8 100644
--- a/plugin/bin/x-pack/syskeygen.bat
+++ b/plugin/bin/x-pack/syskeygen.bat
@@ -6,9 +6,9 @@ rem you may not use this file except in compliance with the Elastic License.
 
 setlocal enabledelayedexpansion
 
-call "%~dp0..\elasticsearch-env.bat"
+call "%~dp0..\elasticsearch-env.bat" || exit /b 1
 
-call "%~dp0x-pack-env.bat"
+call "%~dp0x-pack-env.bat" || exit /b 1
 
 %JAVA% ^
   %ES_JAVA_OPTS% ^
diff --git a/plugin/bin/x-pack/users.bat b/plugin/bin/x-pack/users.bat
index ddd31728683..2284afbd5d3 100644
--- a/plugin/bin/x-pack/users.bat
+++ b/plugin/bin/x-pack/users.bat
@@ -6,9 +6,9 @@ rem you may not use this file except in compliance with the Elastic License.
 
 setlocal enabledelayedexpansion
 
-call "%~dp0..\elasticsearch-env.bat"
+call "%~dp0..\elasticsearch-env.bat" || exit /b 1
 
-call "%~dp0x-pack-env.bat"
+call "%~dp0x-pack-env.bat" || exit /b 1
 
 %JAVA% ^
   %ES_JAVA_OPTS% ^