Fix crashes in room commands with blank IDs
Merge remote-tracking branch 'upstream/master'