Refactored validation.

Moved validation eariler to simplify finishPerson().