diff --git a/build/windows/gitlab-ci/1_build-deps-msys2.sh b/build/windows/gitlab-ci/1_build-deps-msys2.sh
index 07a699da16..8c2cdcf27a 100644
--- a/build/windows/gitlab-ci/1_build-deps-msys2.sh
+++ b/build/windows/gitlab-ci/1_build-deps-msys2.sh
@@ -52,7 +52,7 @@ export XDG_DATA_DIRS="${GIMP_PREFIX}/share:${MSYSTEM_PREFIX}/share/"
 
 clone_or_pull() {
   if [ ! -d "_${1}" ]; then
-    git clone --depth=${GIT_DEPTH} https://gitlab.gnome.org/GNOME/${1}.git _${1}
+    git clone --depth=${GIT_DEPTH} https://gitlab.gnome.org/GNOME/${1}.git _${1} || exit 1
   else
     cd _${1} && git pull && cd ..
   fi
@@ -67,13 +67,12 @@ configure_or_build()
   {
     if [ ! -f "_${1}/_build/build.ninja" ]; then
       mkdir -p _${1}/_build${ARTIFACTS_SUFFIX} && cd _${1}/_build${ARTIFACTS_SUFFIX}
-      meson setup .. -Dprefix="${GIMP_PREFIX}" \
-                     $2
-      ninja && ninja install
+      (meson setup .. -Dprefix="${GIMP_PREFIX}" $2 && \
+       ninja && ninja install) || exit 1
       cd ../..
     else
       cd _${1}/_build${ARTIFACTS_SUFFIX}
-      ninja && ninja install
+      (ninja && ninja install) || exit 1
       cd ../..
     fi
   }
@@ -89,4 +88,4 @@ if [[ "$BUILD_TYPE" != "CI_NATIVE" ]]; then
   mv _babl ~
   mv _gegl ~
   mv "${GIMP_PREFIX}" ~
-fi
\ No newline at end of file
+fi
diff --git a/build/windows/gitlab-ci/2_build-gimp-crossroad.sh b/build/windows/gitlab-ci/2_build-gimp-crossroad.sh
index 857def309a..68bc5a9596 100644
--- a/build/windows/gitlab-ci/2_build-gimp-crossroad.sh
+++ b/build/windows/gitlab-ci/2_build-gimp-crossroad.sh
@@ -1,3 +1,5 @@
+set -e
+
 if [[ "x$CROSSROAD_PLATFORM" = "xw64" ]]; then
     export ARTIFACTS_SUFFIX="-x64"
     export MESON_OPTIONS=""