Fixes possible NPE in addSuperClassFieldsToModels()