[CLC-1579] Nil safeguard against person of no affiliation
Merge pull request #891 from yuhunglin/CLC-1579

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