diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatManager.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatManager.java index 47c6ce10d..b3d605df0 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatManager.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatManager.java @@ -881,6 +881,16 @@ public void serviceChanged(ServiceEvent event) ProtocolProviderService protocolProvider = (ProtocolProviderService) service; + Object multiUserChatOpSet + = protocolProvider + .getOperationSet(OperationSetMultiUserChat.class); + + // We don't care if there's no group chat operation set. + if (multiUserChatOpSet == null) + { + return; + } + if (event.getType() == ServiceEvent.REGISTERED) { chatRoomList.addChatProvider(protocolProvider);