diff --git a/certbotd.sh b/certbotd.sh
index 5f74da6..f6d1c52 100755
--- a/certbotd.sh
+++ b/certbotd.sh
@@ -37,8 +37,6 @@ for SIG in 1 2 3 6 9 14 15; do
   trap "ensure ${SIG}" ${SIG}
 done
 
-set -e
-
 case $1 in
   # Renew certificates, trust in certbot's algorithms
   renew)
@@ -57,9 +55,7 @@ case $1 in
       --agree-tos \
       -d "${SUTTY}" \
       -d "*.${SUTTY}" \
-      -d "*.testing.${SUTTY}"
-
-    touch "${updated}"
+      -d "*.testing.${SUTTY}" && touch "${updated}"
 
     ;;
   prune)
@@ -110,7 +106,7 @@ case $1 in
                                     --webroot \
                                     --agree-tos \
                                     --webroot-path /var/lib/letsencrypt \
-                                    -d "${domain}"
+                                    -d "${domain}" || break
           touch "${updated}"
         done
 esac