diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 2c3b7dc3..22a30672 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -941,7 +941,8 @@ public class ServiceSynchronize extends LifecycleService {
                             if (ex instanceof SendFailedException)
                                 reportError(null, folder.name, ex);
 
-                            db.message().setMessageError(message.id, Helper.formatThrowable(ex));
+                            if (message != null)
+                                db.message().setMessageError(message.id, Helper.formatThrowable(ex));
 
                             if (ex instanceof MessageRemovedException ||
                                     ex instanceof FolderNotFoundException ||