From 03b1c9edf5245f9d053d53b69ef0b5dca2f286ef Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 27 Apr 2022 09:58:38 +0200
Subject: [PATCH] Prevent crash

---
 app/src/main/java/eu/faircode/email/ViewModelMessages.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/ViewModelMessages.java b/app/src/main/java/eu/faircode/email/ViewModelMessages.java
index 8ac800f76e..7a8549f0bd 100644
--- a/app/src/main/java/eu/faircode/email/ViewModelMessages.java
+++ b/app/src/main/java/eu/faircode/email/ViewModelMessages.java
@@ -625,8 +625,10 @@ public class ViewModelMessages extends ViewModel {
                 owner.getLifecycle().addObserver(new LifecycleObserver() {
                     @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
                     public void onDestroyed() {
-                        boundary.destroy(state);
-                        boundary = null;
+                        if (boundary != null) {
+                            boundary.destroy(state);
+                            boundary = null;
+                        }
                         owner.getLifecycle().removeObserver(this);
                     }
                 });