exception fix

Andrey Kryuchkov requested to merge exception_fix into master

Merge request reports