diff --git a/freppledb/execute/management/commands/scheduletasks.py b/freppledb/execute/management/commands/scheduletasks.py
index 821b784bd9..6c10934f02 100644
--- a/freppledb/execute/management/commands/scheduletasks.py
+++ b/freppledb/execute/management/commands/scheduletasks.py
@@ -276,6 +276,7 @@ def handle(self, *args, **options):
                     task.message = "Failed at tasks: %s" % ", ".join(failed)
                 else:
                     task.message = task.check_message
+                raise Exception(task.message)
             else:
                 task.status = "Done"
                 task.message = ""
@@ -314,7 +315,7 @@ def handle(self, *args, **options):
                             to=correctedRecipients,
                         ).send()
                     except Exception as e:
-                        task.message = "Can't send failure e-mail: %s" % e
+                        task.message = "Can't send success e-mail: %s" % e
                         task.save(
                             using=database,
                             update_fields=[