diff --git a/hack/tfw.sh b/hack/tfw.sh
index a6ca836..67fba1e 100755
--- a/hack/tfw.sh
+++ b/hack/tfw.sh
@@ -1,10 +1,11 @@
 #!/usr/bin/env bash
-set -eo pipefail
+set -e
+set -o pipefail
+set -o errtrace
 shopt -s expand_aliases
-
 [ "$(uname)" == "Darwin" ] && alias readlink="greadlink" || :
-SCRIPT_DIR="$(dirname $(readlink -f $0))"
 
+SCRIPT_DIR="$(dirname $(readlink -f $0))"
 TAO_PATH="${TAO_PATH:-$SCRIPT_DIR/../..}"
 BASEIMAGE_REPO="${BASEIMAGE_REPO:-baseimage-tutorial-framework}"
 TEST_REPO="${TEST_REPO:-test-tutorial-framework}"