From 7a4977181f94badd94523f0eb33d82e790de95a1 Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Wed, 31 Jan 2018 15:46:37 +0100
Subject: [PATCH] Fix NPE if MUC occupants cannot be retrieved

---
 .../java/org/jivesoftware/smackx/omemo/OmemoService.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoService.java b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoService.java
index 70272960a..7d00fbf97 100644
--- a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoService.java
+++ b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoService.java
@@ -1187,10 +1187,14 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
                 MultiUserChat muc = getMuc(manager.getConnection(), stanza.getFrom());
                 if (muc != null) {
                     Occupant occupant = muc.getOccupant(stanza.getFrom().asEntityFullJidIfPossible());
+                    if (occupant == null) {
+                        LOGGER.log(Level.WARNING, "Cannot decrypt OMEMO MUC message; MUC Occupant is null.");
+                        return;
+                    }
                     Jid occupantJid = occupant.getJid();
 
                     if (occupantJid == null) {
-                        LOGGER.log(Level.WARNING, "MUC message received, but there is no way to retrieve the senders Jid. " +
+                        LOGGER.log(Level.WARNING, "Cannot decrypt OMEMO MUC message; Senders Jid is null. " +
                                 stanza.getFrom());
                         return;
                     }