fixed error handling for multiple room support