Fixing rethrow exception structure.