Add defensive logic for people collections

Closes #345