Fixed bug where EntityName would sometimes be null due to wrong test in Entity's implementation of that property.