Adjust error handling for consistency

Podhorszki, Norbertrequested to merge
github/fork/chuckatkins/adjust-error-handling-for-consistency into release

Created by: chuckatkins

Merge request reports