Make the entity data optional.

Refs #2267