a bit of refactoring. enable validation and exceptions handlers