Fix the lack of error message on attempts to join nonexistent rooms

Just some rearrangement.