diff --git a/avbroot/ota.py b/avbroot/ota.py
index aa54161..e86081f 100644
--- a/avbroot/ota.py
+++ b/avbroot/ota.py
@@ -701,7 +701,7 @@ def open_signing_wrapper(f, privkey, passphrase, cert):
 
         process.stdin.close()
         signature = process.stdout.read()
-    except Exception:
+    except BaseException:
         process.kill()
         raise
     finally:
diff --git a/avbroot/util.py b/avbroot/util.py
index aea63a1..26a7015 100644
--- a/avbroot/util.py
+++ b/avbroot/util.py
@@ -33,7 +33,7 @@ def open_output_file(path):
                     pass
 
             os.rename(f.name, path)
-        except Exception:
+        except BaseException:
             os.unlink(f.name)
             raise