diff --git a/lib/mu-store.cc b/lib/mu-store.cc
index 4154fd16..f347b7bf 100644
--- a/lib/mu-store.cc
+++ b/lib/mu-store.cc
@@ -132,15 +132,14 @@ struct Store::Private {
 
         }
 
-        ~Private() {
+        ~Private() try {
                 LOCKED;
                 if (wdb()) {
                         wdb()->set_metadata (ContactsKey, contacts_.serialize());
                         if (in_transaction_)  // auto-commit.
                                 wdb()->commit_transaction();
                 }
-
-        }
+        } MU_XAPIAN_CATCH_BLOCK;
 
         std::shared_ptr<Xapian::Database> db() const {
                 if (!db_)