From 25f4154cde7b35621bcd74e827a704766d5d0abe Mon Sep 17 00:00:00 2001
From: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
Date: Mon, 24 May 2021 12:01:45 -0700
Subject: [PATCH] Add checks for unregistering message receiver

---
 ts/background.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ts/background.ts b/ts/background.ts
index 99c09dec4..85bcc1018 100644
--- a/ts/background.ts
+++ b/ts/background.ts
@@ -1840,8 +1840,10 @@ export async function startApp(): Promise<void> {
         await messageReceiver.stopProcessing();
 
         await window.waitForAllBatchers();
-        messageReceiver.unregisterBatchers();
+      }
 
+      if (messageReceiver) {
+        messageReceiver.unregisterBatchers();
         messageReceiver = null;
       }
 
@@ -3185,8 +3187,10 @@ export async function startApp(): Promise<void> {
       await messageReceiver.stopProcessing();
 
       await window.waitForAllBatchers();
-      messageReceiver.unregisterBatchers();
+    }
 
+    if (messageReceiver) {
+      messageReceiver.unregisterBatchers();
       messageReceiver = null;
     }