Improve Error Catch

Merged Jose Luis Zanotti requested to merge Improvement into 12.0

Merge request reports