master
Errors refactoring