Add bounds checking for room