CSV export Person-based refactor: addl null checks