Fix for NPE when changing class from command in waitroom