diff --git a/fs_uae_wrapper/archive.py b/fs_uae_wrapper/archive.py
index 35aebb8..5aedca3 100644
--- a/fs_uae_wrapper/archive.py
+++ b/fs_uae_wrapper/archive.py
@@ -73,13 +73,3 @@ class Wrapper(base.ArchiveBase):
         shutil.move(arch, self.arch_filepath)
         os.chdir(curdir)
         return True
-
-
-def run(config_file, fsuae_options, configuration):
-    """Run fs-uae with provided config file and options"""
-
-    runner = Wrapper(config_file, fsuae_options, configuration)
-    try:
-        return runner.run()
-    finally:
-        runner.clean()
diff --git a/fs_uae_wrapper/cd32.py b/fs_uae_wrapper/cd32.py
index 42c17a4..56a4fcf 100644
--- a/fs_uae_wrapper/cd32.py
+++ b/fs_uae_wrapper/cd32.py
@@ -46,13 +46,3 @@ class Wrapper(base.ArchiveBase):
             return self._save_save()
 
         return True
-
-
-def run(config_file, fsuae_options, configuration):
-    """Run fs-uae with provided config file and options"""
-
-    runner = Wrapper(config_file, fsuae_options, configuration)
-    try:
-        return runner.run()
-    finally:
-        runner.clean()
diff --git a/fs_uae_wrapper/wrapper.py b/fs_uae_wrapper/wrapper.py
index 1358956..5bdb408 100644
--- a/fs_uae_wrapper/wrapper.py
+++ b/fs_uae_wrapper/wrapper.py
@@ -78,7 +78,14 @@ def run():
                              "exists.\n" % wrapper_module)
             sys.exit(3)
 
-    if not wrapper.run(config_file, fsuae_options, configuration):
+    runner = wrapper.Wrapper(config_file, fsuae_options, configuration)
+
+    try:
+        exit_code = runner.run()
+    finally:
+        runner.clean()
+
+    if not exit_code:
         sys.exit(4)