From 86f8fe54ae7c7dea4cfb28b607efc2a662509d7f Mon Sep 17 00:00:00 2001
From: Konstantin Ullrich <konstantinullrich12@gmail.com>
Date: Sat, 15 Aug 2020 13:21:35 +0200
Subject: [PATCH] Check for model in blocked settings

---
 ts/components/session/settings/SessionSettings.tsx | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/ts/components/session/settings/SessionSettings.tsx b/ts/components/session/settings/SessionSettings.tsx
index 043dcd6dd..f98269898 100644
--- a/ts/components/session/settings/SessionSettings.tsx
+++ b/ts/components/session/settings/SessionSettings.tsx
@@ -603,11 +603,15 @@ export class SettingsView extends React.Component<SettingsViewProps, State> {
       let title: string;
 
       const currentModel = window.ConversationController.get(blockedNumber);
-      title =
+      if (currentModel) {
+        title =
         currentModel.getProfileName() ||
         currentModel.getName() ||
         window.i18n('anonymous');
-
+      } else {
+        title = window.i18n('anonymous');
+      }
+      
       title = `${title} ${window.shortenPubkey(blockedNumber)}`;
 
       results.push({
@@ -622,7 +626,11 @@ export class SettingsView extends React.Component<SettingsViewProps, State> {
         },
         comparisonValue: undefined,
         setFn: async () => {
-          await currentModel.unblock();
+          if (currentModel) {
+            await currentModel.unblock();
+          } else {
+            await BlockedNumberController.unblock(blockedNumber)
+          }
           ToastUtils.push({
             title: window.i18n('unblocked'),
             id: 'unblocked',