Check `validate` option before validating
Fix failing test case for `validate` option
Merge pull request #3036 from tigrang/bug-fix-validate

Check `validate` option before validating