added some protection for clients without room#'s