[CLC-1579] QA:  Nil safeguard against person of no affiliation
Merge pull request #892 from yuhunglin/CLC-1579-qa

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