diff --git a/certbotd.sh b/certbotd.sh
index f6d1c52..5d4e2f7 100755
--- a/certbotd.sh
+++ b/certbotd.sh
@@ -37,6 +37,8 @@ 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)
@@ -106,7 +108,8 @@ case $1 in
                                     --webroot \
                                     --agree-tos \
                                     --webroot-path /var/lib/letsencrypt \
-                                    -d "${domain}" || break
+                                    -d "${domain}" || ensure $?
+
           touch "${updated}"
         done
 esac