From ba927bf37928b1beb7d96e0e037530aeefb4cb84 Mon Sep 17 00:00:00 2001
From: Salvatore Giordano <salvatoregiordanoo@gmail.com>
Date: Tue, 29 Jun 2021 12:20:37 +0200
Subject: [PATCH] add null check

---
 .../lib/src/message_search_list_core.dart                   | 6 ++++--
 .../stream_chat_flutter_core/lib/src/user_list_core.dart    | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/stream_chat_flutter_core/lib/src/message_search_list_core.dart b/packages/stream_chat_flutter_core/lib/src/message_search_list_core.dart
index 636a879f..d354daec 100644
--- a/packages/stream_chat_flutter_core/lib/src/message_search_list_core.dart
+++ b/packages/stream_chat_flutter_core/lib/src/message_search_list_core.dart
@@ -120,8 +120,10 @@ class MessageSearchListCoreState extends State<MessageSearchListCore> {
   }
 
   void _setupController() {
-    widget.messageSearchListController!.loadData = loadData;
-    widget.messageSearchListController!.paginateData = paginateData;
+    if (widget.messageSearchListController != null) {
+      widget.messageSearchListController!.loadData = loadData;
+      widget.messageSearchListController!.paginateData = paginateData;
+    }
   }
 
   @override
diff --git a/packages/stream_chat_flutter_core/lib/src/user_list_core.dart b/packages/stream_chat_flutter_core/lib/src/user_list_core.dart
index 05a8432d..db6b3586 100644
--- a/packages/stream_chat_flutter_core/lib/src/user_list_core.dart
+++ b/packages/stream_chat_flutter_core/lib/src/user_list_core.dart
@@ -139,8 +139,10 @@ class UserListCoreState extends State<UserListCore>
   }
 
   void _setupController() {
-    widget.userListController!.loadData = loadData;
-    widget.userListController!.paginateData = paginateData;
+    if (widget.userListController != null) {
+      widget.userListController!.loadData = loadData;
+      widget.userListController!.paginateData = paginateData;
+    }
   }
 
   @override