diff --git a/.github/tf.sh b/.github/tf.sh
index cfbdcaa..25866c7 100644
--- a/.github/tf.sh
+++ b/.github/tf.sh
@@ -58,10 +58,8 @@ set +e
 $IAC_BIN init
 TF_INIT_EXIT_CODE=$?
 set +x
-if [[ "INIT" == "$SAFE_ACTION" ]]; then
+if [[ "INIT" == "$SAFE_ACTION" || "0" != "$TF_INIT_EXIT_CODE" ]]; then
   set -x
-  exit $TF_INIT_EXIT_CODE
-elif [[ "0" != "$TF_INIT_EXIT_CODE" ]]; then
   $IAC_BIN providers
   set -e
   exit $TF_INIT_EXIT_CODE
@@ -72,10 +70,8 @@ set +e
 $IAC_BIN validate
 TF_VALIDATE_EXIT_CODE=$?
 set +x
-if [[ "VALIDATE" == "$SAFE_ACTION" ]]; then
+if [[ "VALIDATE" == "$SAFE_ACTION" || "0" != "$TF_VALIDATE_EXIT_CODE" ]]; then
   set -x
-  exit $TF_VALIDATE_EXIT_CODE
-elif [[ "0" != "$TF_VALIDATE_EXIT_CODE" ]]; then
   set -e
   exit $TF_VALIDATE_EXIT_CODE
 fi