Added basic handling of cases where an entity has no names. Closes #7.