[CLC-1579] Nil safeguard against person of no affiliation

JIRA: https://jira.media.berkeley.edu/jira/browse/CLC-1579