Exception message seems wrong (was moved from `loadEntityType` method where "no catalog item for type" was right to include. Change to `"Could not load class {} directly; rethrowing"`?