From 93836d94eea31bb2a7c863160441573efc32303b Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 16 Jul 2018 20:49:30 +0200
Subject: [PATCH] null pointer check in notification service

---
 .../eu/siacs/conversations/services/NotificationService.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/eu/siacs/conversations/services/NotificationService.java b/src/main/java/eu/siacs/conversations/services/NotificationService.java
index 8901d69bf..88a0573d1 100644
--- a/src/main/java/eu/siacs/conversations/services/NotificationService.java
+++ b/src/main/java/eu/siacs/conversations/services/NotificationService.java
@@ -181,7 +181,7 @@ public class NotificationService {
 	public void push(final Message message) {
 		synchronized (CATCHUP_LOCK) {
 			final XmppConnection connection = message.getConversation().getAccount().getXmppConnection();
-			if (connection.isWaitingForSmCatchup()) {
+			if (connection != null && connection.isWaitingForSmCatchup()) {
 				connection.incrementSmCatchupMessageCounter();
 				pushFromBacklog(message);
 			} else {