Added checks for empty CurrentRoom