From 05c689bad6f5c92d7c3d1ef0e588ddf60008d44e Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Fri, 3 Aug 2018 17:59:24 +0200
Subject: [PATCH] Fix a crashing bug

Signed-off-by: Mario Danic <mario@lovelyhq.com>
---
 .../com/nextcloud/talk/controllers/ChatController.java    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
index ccd708ecf..e564f392b 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
@@ -741,9 +741,13 @@ public class ChatController extends BaseController implements MessagesListAdapte
                 }
 
                 if (chatMessageList.size() == 0) {
-                    emptyLayout.setVisibility(View.VISIBLE);
+                    if (emptyLayout != null) {
+                        emptyLayout.setVisibility(View.VISIBLE);
+                    }
                 } else {
-                    messagesListView.setVisibility(View.VISIBLE);
+                    if (messagesListView != null) {
+                        messagesListView.setVisibility(View.VISIBLE);
+                    }
                 }
             } else {
                 if (emptyLayout.getVisibility() != View.GONE) {