From d29c440b605cfbdb21a0613e291fc3fb06701d15 Mon Sep 17 00:00:00 2001
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Mon, 6 Jun 2022 12:16:40 -0500
Subject: [PATCH] Fix NPE

---
 src/main/java/eu/siacs/conversations/entities/Presences.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/eu/siacs/conversations/entities/Presences.java b/src/main/java/eu/siacs/conversations/entities/Presences.java
index 97560bd2d1dd9809011a6a10995dace11ef07361..e32e7e7a005b8f8b7b98ca721e701a64c7cd76a4 100644
--- a/src/main/java/eu/siacs/conversations/entities/Presences.java
+++ b/src/main/java/eu/siacs/conversations/entities/Presences.java
@@ -153,7 +153,8 @@ public class Presences {
         for (Map.Entry<String, Presence> entry : this.presences.entrySet()) {
             String resource = entry.getKey();
             Presence presence = entry.getValue();
-            if (presence.getServiceDiscoveryResult().getFeatures().contains(namespace)) {
+            ServiceDiscoveryResult disco = presence.getServiceDiscoveryResult();
+            if (disco != null && disco.getFeatures().contains(namespace)) {
                 return resource;
             }
         }