fixes in error handling

Merge request reports

Loading