master
Errors messaging refactoring