Don't rethrow exceptions in wrap.
Change filenames.