diff --git a/build.bat b/build.bat
index f14b4b269..d5ccd3aa9 100644
--- a/build.bat
+++ b/build.bat
@@ -8,9 +8,16 @@ cfengine="lucee@5" ^
 port=8765 ^
 openbrowser=false ^
 directory=%CWD% ^
-javaVersion=openjdk8_jre_jdk8u332-b09 ^
+javaVersion=openjdk88_jre_jdk8u132-b09 ^
 heapSize=2048
 
+@echo off
+IF ERRORLEVEL EQ 0 GOTO start
+echo Exiting build, CommandBox build failed with exitcode %exitcode%
+exit /b %exitcode%
+echo on
+:start
+
 echo Done!
 echo Importing reference docs from previously undocumented functions and tags...
 curl http://localhost:8765/import.cfm?textlogs=true
diff --git a/build.sh b/build.sh
index 0235e491b..135a6ba50 100755
--- a/build.sh
+++ b/build.sh
@@ -11,9 +11,16 @@ cfengine="lucee@5" \
 port=8765 \
 openbrowser=false \
 directory=$CWD \
-javaVersion=openjdk8_jre_jdk8u332-b09 \
+javaVersion=openjdk8_jre_jdk8u132-b09 \
 heapSize=2048;
 
+if [ -f .exitcode ]; then
+  exitcode=$(<.exitcode)
+  rm -f .exitcode
+  echo "Exiting build, Lucee / CommandBox failed to start. Exit code: $exitcode"
+  exit $exitcode
+fi
+
 echo "Local Lucee Server Started!";
 echo "Importing reference docs from previously undocumented functions and tags..."
 curl --no-progress-meter http://localhost:8765/import.cfm?textlogs=true