diff --git a/PyViCare/PyViCare.py b/PyViCare/PyViCare.py
index ec41d5df..b408eea8 100644
--- a/PyViCare/PyViCare.py
+++ b/PyViCare/PyViCare.py
@@ -8,7 +8,7 @@
 from PyViCare.PyViCareOAuthManager import ViCareOAuthManager
 from PyViCare.PyViCareRoomControl import RoomControl
 from PyViCare.PyViCareService import ViCareDeviceAccessor, ViCareService
-from PyViCare.PyViCareUtils import PyViCareInvalidDataError, PyViCareNotSupportedFeatureError
+from PyViCare.PyViCareUtils import PyViCareInvalidDataError
 
 logger = logging.getLogger(__name__)
 logger.addHandler(logging.NullHandler())
@@ -86,7 +86,7 @@ def __enrichZigbeeDevices(self):
             room_control = RoomControl(device_config.service)
             try:
                 actor_map = room_control.buildActorRoomMap()
-            except (KeyError, IndexError, PyViCareNotSupportedFeatureError):
+            except Exception:  # pylint: disable=broad-exception-caught
                 logger.debug("Could not build actor map for %s", device_config.getModel(), exc_info=True)
                 continue