Added Handling for no next room