diff --git a/admin/update_autogen b/admin/update_autogen
index 2b6a46051cb..99297a9c0dc 100755
--- a/admin/update_autogen
+++ b/admin/update_autogen
@@ -44,7 +44,7 @@ PD=${0%/*}
 [ "$PD" = "$0" ] && PD=.        # if PATH includes PWD
 
 ## This should be the admin directory.
-cd $PD
+cd $PD || exit
 cd ../
 [ -d admin ] || die "Could not locate admin directory"
 
@@ -102,7 +102,7 @@ done
 
 tempfile=/tmp/$PN.$$
 
-trap "rm -f $tempfile 2> /dev/null" EXIT
+trap 'rm -f $tempfile 2> /dev/null' EXIT
 
 
 while getopts ":hcfqA:CL" option ; do