diff --git a/odoo/sql_db.py b/odoo/sql_db.py
index 6a015165d87..85dae5c92a3 100644
--- a/odoo/sql_db.py
+++ b/odoo/sql_db.py
@@ -198,9 +198,11 @@ class BaseCursor:
         return self
 
     def __exit__(self, exc_type, exc_value, traceback):
-        if exc_type is None:
-            self.commit()
-        self.close()
+        try:
+            if exc_type is None:
+                self.commit()
+        finally:
+            self.close()
 
 
 class Cursor(BaseCursor):