Move the check for personId.