Remove over-aggressive wrapping of Exceptions