1 files changed, 9 insertions, 1 deletions
diff --git a/cpp/src/Freeze/ObjectStore.cpp b/cpp/src/Freeze/ObjectStore.cpp
index 55d5e243c66..189ffe4ad49 100644
--- a/cpp/src/Freeze/ObjectStore.cpp
+++ b/cpp/src/Freeze/ObjectStore.cpp
@@ -208,7 +208,15 @@ Freeze::ObjectStoreBase::~ObjectStoreBase()
         
         for(size_t i = 0; i < _indices.size(); ++i)
         {
-            _indices[i]->_impl->close();
+            try
+            {
+                _indices[i]->_impl->close();
+            }
+            catch(const DatabaseException& ex)
+            {
+                Ice::Error error(_communicator->getLogger());
+                error << "Freeze: closing ObjectStore " << _dbName << " raised DatabaseException: " << ex.what();
+            }
         }
         _indices.clear();
     }