diff --git a/modules/jlink/artifacts/opt/jboss/container/java/jlink/mkdeps.sh b/modules/jlink/artifacts/opt/jboss/container/java/jlink/mkdeps.sh
index bc9d55ba..7a53e782 100755
--- a/modules/jlink/artifacts/opt/jboss/container/java/jlink/mkdeps.sh
+++ b/modules/jlink/artifacts/opt/jboss/container/java/jlink/mkdeps.sh
@@ -21,10 +21,7 @@ function generate_deps() {
         --module-path dependencies \
         "$JAVA_APP_JAR" \
         "$JAVA_LIB_DIR"/**/*.jar \
-        > deps.txt || {
-        echo "jdeps failed: return code $?"
-        exit $?
-      }
+        > deps.txt
   else 
     $JAVA_HOME/bin/jdeps --multi-release $JAVA_VERSION -R -s \
       --module-path dependencies \
diff --git a/modules/s2i/bash/artifacts/usr/local/s2i/assemble b/modules/s2i/bash/artifacts/usr/local/s2i/assemble
index e2f1e4ef..81dd72eb 100644
--- a/modules/s2i/bash/artifacts/usr/local/s2i/assemble
+++ b/modules/s2i/bash/artifacts/usr/local/s2i/assemble
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-set -e
+set -eo pipefail
 
 source "${JBOSS_CONTAINER_UTIL_LOGGING_MODULE}/logging.sh"
 source "${JBOSS_CONTAINER_MAVEN_S2I_MODULE}/maven-s2i"
@@ -27,18 +27,30 @@ if [ "$S2I_ENABLE_JLINK" = "true" ]; then
 
     source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/mkdeps.sh"
     echo "Invoking mkdeps"
-    generate_deps
+    generate_deps || {
+        log_error "mkdeps failed, return code: $?"
+        exit 1
+    }
 
     source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/mkstrippeddeps.sh"
     echo "Stripping dependencies"
-    mkstrippeddeps
+    mkstrippeddeps || {
+        log_error "stripping dependencies failed, return code: $?"
+        exit 1
+    }
 
     source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/generatejdkdeps.sh"
     echo "Generating JDK dependencies"
-    generatejdkdeps
+    generatejdkdeps || {
+        log_error "generating JDK dependencies failed, return code: $?"
+        exit 1
+    }
 
     source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/mkjreimage.sh"
     echo "Linking jre"
-    generate_jre_image
+    generate_jre_image || {
+        log_error "Linking JRE failed, return code: $?"
+        exit 1
+    }
 
 fi