Fixed NPE when a new user joins