Move try/catch to restore old flow
Refactored validating data provider
Simplified previous refactoring