Added room to socket and room null checks