Undo tweak error handling Undo recently added exception capturing, does not work as expected See merge request !22
