Fix error handling

Andrey Veltischev requested to merge andrey/error_handling into master

Merge request reports