diff --git a/gui/griffon-app/controllers/com/muwire/gui/ChatRoomController.groovy b/gui/griffon-app/controllers/com/muwire/gui/ChatRoomController.groovy
index b40107ea..2e7de476 100644
--- a/gui/griffon-app/controllers/com/muwire/gui/ChatRoomController.groovy
+++ b/gui/griffon-app/controllers/com/muwire/gui/ChatRoomController.groovy
@@ -251,7 +251,7 @@ class ChatRoomController {
     }
     
     void rejoinRoom() {
-        if (model.room == "Console")
+        if (model.console || model.privateChat)
             return
         
         model.members.clear()
@@ -276,7 +276,7 @@ class ChatRoomController {
     void serverDisconnected() {
         runInsideUIAsync {
             model.members.clear()
-            view.membersTable?.model.fireTableDataChanged()
+            view.membersTable?.model?.fireTableDataChanged()
         }
     }
 }
\ No newline at end of file