diff --git a/hack/bootstrap_tfw_dev.sh b/hack/bootstrap_tfw_dev.sh
index 393e9f8..9b3d9cf 100755
--- a/hack/bootstrap_tfw_dev.sh
+++ b/hack/bootstrap_tfw_dev.sh
@@ -1,4 +1,4 @@
-set -e
+set -eo pipefail
 
 LOGFILE="/tmp/bootstrap_tfw.log"
 trap 'echo "Something went wrong. Read the log az $LOGFILE"' ERR
diff --git a/hack/tfw_magic_start.sh b/hack/tfw_magic_start.sh
index 3a262b5..dadf54c 100755
--- a/hack/tfw_magic_start.sh
+++ b/hack/tfw_magic_start.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -e
+set -eo pipefail
 
 [ "$(uname)" == "Darwin" ] && readlink_cmd="greadlink" || readlink_cmd="readlink"
 SCRIPT_DIR="$(dirname $($readlink_cmd -f $0))"