Improve error handling for undefined room/zone objects