1 files changed, 7 insertions, 5 deletions
diff --git a/src/net/java/sip/communicator/impl/protocol/irc/ProtocolProviderServiceIrcImpl.java b/src/net/java/sip/communicator/impl/protocol/irc/ProtocolProviderServiceIrcImpl.java
index bd6cf84..84a65e5 100644
--- a/src/net/java/sip/communicator/impl/protocol/irc/ProtocolProviderServiceIrcImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/irc/ProtocolProviderServiceIrcImpl.java
@@ -364,15 +364,16 @@ public class ProtocolProviderServiceIrcImpl
     public void unregister()
         throws OperationFailedException
     {
-        for (ChatRoom joinedChatRoom
-                : multiUserChat.getCurrentlyJoinedChatRooms())
+        for (ChatRoom joinedChatRoom : multiUserChat
+            .getCurrentlyJoinedChatRooms())
         {
             joinedChatRoom.leave();
         }
 
-        if (ircStack.isConnected())
+        final IrcConnection connection = this.ircStack.getConnection();
+        if (connection != null)
         {
-            ircStack.disconnect();
+            this.ircStack.disconnect();
         }
     }
 
@@ -385,7 +386,8 @@ public class ProtocolProviderServiceIrcImpl
     @Override
     public boolean isSignalingTransportSecure()
     {
-        return this.ircStack.isSecureConnection();
+        final IrcConnection connection = this.ircStack.getConnection();
+        return connection != null && connection.isSecureConnection();
     }
 
     /**