Allow null strings in entity name