diff --git a/pmb/chroot/apk_static.py b/pmb/chroot/apk_static.py
index cfc99031..62c18dee 100644
--- a/pmb/chroot/apk_static.py
+++ b/pmb/chroot/apk_static.py
@@ -102,7 +102,7 @@ def verify_signature(args, files, sigkey_path):
                                     sigkey_path, "-signature", files[
                                         "sig"]["temp_path"],
                                     files["apk"]["temp_path"]], check=True)
-    except:
+    except BaseException:
         os.unlink(files["sig"]["temp_path"])
         os.unlink(files["apk"]["temp_path"])
         raise RuntimeError("Failed to validate signature of apk.static."
diff --git a/pmb/helpers/logging.py b/pmb/helpers/logging.py
index 2b89bdc9..f5f137c9 100644
--- a/pmb/helpers/logging.py
+++ b/pmb/helpers/logging.py
@@ -44,7 +44,7 @@ class log_handler(logging.StreamHandler):
 
         except (KeyboardInterrupt, SystemExit):
             raise
-        except:
+        except BaseException:
             self.handleError(record)