diff --git a/syncplay/__init__.py b/syncplay/__init__.py
index a8dfe93..baed569 100755
--- a/syncplay/__init__.py
+++ b/syncplay/__init__.py
@@ -1,5 +1,5 @@
 version = '1.6.6'
-revision = ' beta 1'
+revision = ' beta 2'
 milestone = 'Yoitsu'
-release_number = '88'
+release_number = '89'
 projectURL = 'https://syncplay.pl/'
diff --git a/syncplay/client.py b/syncplay/client.py
index 202cd3f..efe1c77 100755
--- a/syncplay/client.py
+++ b/syncplay/client.py
@@ -1042,8 +1042,11 @@ class SyncplayClient(object):
     def storeControlPassword(self, room, password):
         if password:
             self.controlpasswords[room] = password
-            if self._config['autosaveJoinsToList']:
-                self.ui.addRoomToList(room+":"+password)
+            try:
+                if self._config['autosaveJoinsToList']:
+                    self.ui.addRoomToList(room+":"+password)
+            except:
+                pass
 
     def getControlledRoomPassword(self, room):
         if room in self.controlpasswords:
diff --git a/syncplay/ui/gui.py b/syncplay/ui/gui.py
index c59c569..fb96024 100755
--- a/syncplay/ui/gui.py
+++ b/syncplay/ui/gui.py
@@ -891,8 +891,11 @@ class MainWindow(QtWidgets.QMainWindow):
 
     def updateRoomName(self, room=""):
         self.roomsCombobox.setEditText(room)
-        if self.config['autosaveJoinsToList']:
-            self.addRoomToList(room)
+        try:
+            if self.config['autosaveJoinsToList']:
+                self.addRoomToList(room)
+        except:
+            pass
 
     def showDebugMessage(self, message):
         print(message)