Fixed null pointer exception for class sessions without a room attached
Tidied up nil room handling