Fix null class name