improve error handling on entities that can't be resolved