Rewrite no longer wraps Exceptions unnecessarily