fix for a NPE caused by EntityTypes not having a chance