Proper error management
Merge pull request #21 from spiral-project/errors_proper_management

Proper error management