Fix Horse not being found in old versions
Cleaner
Don't attempt to use EntityType's that are null