diff --git a/aicommit_groq b/aicommit_groq
index 9b541b6..9856ced 100755
--- a/aicommit_groq
+++ b/aicommit_groq
@@ -1,5 +1,11 @@
 #!/bin/bash
-pushd $(pwd) >/dev/null
+
+set -eu
+set -o pipefail
+
+ARGS=("${@-}")
+
+pushd $(pwd) >/dev/null || exit 1
 
 TMP_FILE="/tmp/aicommit"
 
@@ -40,4 +46,4 @@ fi
  
 git commit -e -m "$(cat ${TMP_FILE})" && rm ${TMP_FILE}
 
-popd >/dev/null
+popd >/dev/null || exit 1