SWC-670: check for valid entity name, allow blank