Fixes from upstream merge.
Don't add try to add the person object more than once