Fix wrap of Exceptions