diff --git a/radicale/__init__.py b/radicale/__init__.py
index ca10e840..88b1bb67 100644
--- a/radicale/__init__.py
+++ b/radicale/__init__.py
@@ -120,7 +120,7 @@ class HTTPServer(wsgiref.simple_server.WSGIServer):
             try:
                 self.server_bind()
                 self.server_activate()
-            except:
+            except BaseException:
                 self.server_close()
                 raise
 
diff --git a/radicale/storage.py b/radicale/storage.py
index 6d949872..9ac3842c 100644
--- a/radicale/storage.py
+++ b/radicale/storage.py
@@ -779,7 +779,7 @@ class Collection(BaseCollection):
                                    (path, e)) from e
             tmp.close()
             os.replace(tmp.name, path)
-        except:
+        except BaseException:
             tmp.close()
             os.remove(tmp.name)
             raise