Harden entity parsing.

To deal with some still broken data in Cassandra.