[#621] Do 'extras_validation' before other validation

Fixes #621.