[FIX] exceptions

Merged Luciano Ortiz requested to merge T4770-fix into 15.0-stage

Merge request reports