Re-implemented the exception wrapper, but in a better way.