diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java index 2a1e40b07e5d0fa400db10ac999d33c2d6c990dd..2ba1a423d5bb76d7435a45b8b01377b6b235625f 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java @@ -1210,7 +1210,7 @@ public class ConversationFragment extends XmppFragment @Override public void onCreateOptionsMenu(Menu menu, MenuInflater menuInflater) { - if (activity.xmppConnectionService.isOnboarding()) return; + if (activity != null && activity.xmppConnectionService != null && activity.xmppConnectionService.isOnboarding()) return; menuInflater.inflate(R.menu.fragment_conversation, menu); final MenuItem menuMucDetails = menu.findItem(R.id.action_muc_details);