no id for person, and remove None check. raise instead of return
fix merge conflicts