diff --git a/docs/setup.sh b/docs/setup.sh
index a6e3e031..014e6ce6 100755
--- a/docs/setup.sh
+++ b/docs/setup.sh
@@ -39,8 +39,7 @@ cat /home/albert/.ssh/id_ed25519.pub >> ./keys/ssh/keys.txt
 # Add all changes to git and and push
 echo ">>> Pushing to git..... "
 git add keys/hosts/`hostname`.asc
-git -c commit.gpgsign=false commit
-git commit -am "Setup: `hostname`"
+git -c commit.gpgsign=false commit -am "Setup: `hostname`"
 git push
 
 echo
@@ -51,4 +50,4 @@ echo
 echo
 echo ">>> Reminder:  Upload these changes to git"
 
-popd
+popd || exit