diff --git a/backend/src/Squidex.Domain.Apps.Entities/Backup/RestoreProcessor.cs b/backend/src/Squidex.Domain.Apps.Entities/Backup/RestoreProcessor.cs
index 0e1bf901b..5308f35f9 100644
--- a/backend/src/Squidex.Domain.Apps.Entities/Backup/RestoreProcessor.cs
+++ b/backend/src/Squidex.Domain.Apps.Entities/Backup/RestoreProcessor.cs
@@ -150,6 +150,11 @@ namespace Squidex.Domain.Apps.Entities.Backup
                         await ReadEventsAsync(run, ct);
                     }
 
+                    if (run.Context == null)
+                    {
+                        throw new BackupRestoreException("Backup has no event.");
+                    }
+
                     foreach (var handler in run.Handlers)
                     {
                         using (Telemetry.Activities.StartActivity($"{handler.GetType().Name}/RestoreAsync"))
@@ -170,6 +175,7 @@ namespace Squidex.Domain.Apps.Entities.Backup
                         await LogAsync(run, $"Completed {handler.Name}");
                     }
 
+                    // Add the current user to the app, so that the admin can see it and verify integrity.
                     await AssignContributorAsync(run);
 
                     await SetStatusAsync(run, JobStatus.Completed, "Completed, Yeah!");
@@ -178,6 +184,9 @@ namespace Squidex.Domain.Apps.Entities.Backup
                 }
                 catch (Exception ex)
                 {
+                    // Cleanup as soon as possible.
+                    await CleanupAsync(run);
+
                     var message = "Failed with internal error.";
 
                     switch (ex)
@@ -190,8 +199,6 @@ namespace Squidex.Domain.Apps.Entities.Backup
                             break;
                     }
 
-                    await CleanupAsync(run);
-
                     await SetStatusAsync(run, JobStatus.Failed, message);
 
                     log.LogError(ex, "Backup with job id {backupId} from URL '{url}' failed.", run.Job.Id, run.Job.Url);