My proposition how to handle unexpected SensorTypes. In SensorMonitorTask I added throwing exceptions as this is unexpected to pass invalid sensor type in there. In ZoneRequestHandler I have added no action for known types and error response for invalid values. In SystemZoneSensorForward no action for all types, as we will just not find any device in case invalid type is set Please verify if this is what you intended.