fixed NPE in channel discovery after race to create menu

1 files changed, 1 insertions, 1 deletions

diff --git a/src/main/java/de/pixart/messenger/ui/ChannelDiscoveryActivity.java b/src/main/java/de/pixart/messenger/ui/ChannelDiscoveryActivity.java
index 3233aa35c..79d88ca6f 100644
--- a/src/main/java/de/pixart/messenger/ui/ChannelDiscoveryActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ChannelDiscoveryActivity.java
@@ -87,7 +87,7 @@ public class ChannelDiscoveryActivity extends XmppActivity implements MenuItem.O
             mMenuSearchView.expandActionView();
             mSearchEditText.append(initialSearchValue);
             mSearchEditText.requestFocus();
-            if (optedIn) {
+            if (optedIn && xmppConnectionService != null) {
                 xmppConnectionService.discoverChannels(initialSearchValue, this);
             }
         }