diff --git a/git-hangman-lab/scripts/generate-access-token b/git-hangman-lab/scripts/generate-access-token
index da3e4ef..c76e1ca 100755
--- a/git-hangman-lab/scripts/generate-access-token
+++ b/git-hangman-lab/scripts/generate-access-token
@@ -7,11 +7,12 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 "$SCRIPT_DIR/check-git-cred"
 
 username=$(secret-mgr get-username --key git)
-token_output=$("$SCRIPT_DIR/gitea" admin user generate-access-token --username "$username" --token-name "$username")
-
-# Extract token from output (format: "Access token was successfully created: <token>")
-token=$(echo "$token_output" | awk '{print $NF}')
+output=$("$SCRIPT_DIR/gitea" admin user generate-access-token --username "$username" --token-name "$username" 2>&1) || {
+  echo "Failed to generate access token: $output"
+  exit 1
+}
 
+token=$(echo "$output" | awk '{print $NF}')
 secret-mgr set --key git-access-token --username "$username" --secret "$token"
 
 echo "Access token generated and stored successfully"