The use of MetamodelImplementor#entityPersister(java.lang.String) in SessionFactoryHelper#findEntityPersisterByName unnecessarily causes many exceptions for every query compilation. It can easily be replaced by using MetamodelImplementor#entityPersisters and acting on a null return.