diff --git a/intelmq/bots/outputs/smtp_batch/output.py b/intelmq/bots/outputs/smtp_batch/output.py
index 5661ea733..b5aa5f099 100644
--- a/intelmq/bots/outputs/smtp_batch/output.py
+++ b/intelmq/bots/outputs/smtp_batch/output.py
@@ -167,8 +167,12 @@ def cli_run(self):
                 sys.exit(0)
             elif i == "all":
                 count = 0
+                exit_code = 0
                 for mail in mails:
-                    if self.build_mail(mail, send=True):
+                    succ = self.build_mail(mail, send=True)
+                    if not succ:
+                        exit_code = 1
+                    else:
                         count += 1
                         print(f"{mail.to} ", end="", flush=True)
                         try:
@@ -183,7 +187,7 @@ def cli_run(self):
                         if mail.path:
                             os.unlink(mail.path)
                 print(f"\n{count}× mail sent.\n")
-                sys.exit(0)
+                sys.exit(exit_code)
             elif i == "clear":
                 for mail in mails:
                     self.cache.redis.delete(mail.key)