Add Exception wrapping support