diff --git a/src/OpenFOAM/db/objectRegistry/objectRegistry.C b/src/OpenFOAM/db/objectRegistry/objectRegistry.C
index 9d01de9d90..452ad35ac6 100644
--- a/src/OpenFOAM/db/objectRegistry/objectRegistry.C
+++ b/src/OpenFOAM/db/objectRegistry/objectRegistry.C
@@ -82,15 +82,21 @@ Foam::objectRegistry::objectRegistry
 
 Foam::objectRegistry::~objectRegistry()
 {
+    List<regIOobject*> myObjects(size());
+    label nMyObjects = 0;
+
     for (iterator iter = begin(); iter != end(); ++iter)
     {
         if (iter()->ownedByRegistry())
         {
-            regIOobject* object = iter();
-            erase(iter);
-            delete object;
+            myObjects[nMyObjects++] = iter();
         }
     }
+
+    for (label i=0; i<nMyObjects; i++)
+    {
+        checkOut(*myObjects[i]);
+    }
 }
 
 
@@ -235,7 +241,7 @@ bool Foam::objectRegistry::checkOut(regIOobject& io) const
                 << endl;
         }
     }
-    
+
     return false;
 }
 
diff --git a/src/OpenFOAM/db/regIOobject/regIOobjectI.H b/src/OpenFOAM/db/regIOobject/regIOobjectI.H
index 033d3d50a0..2f31e0e9c4 100644
--- a/src/OpenFOAM/db/regIOobject/regIOobjectI.H
+++ b/src/OpenFOAM/db/regIOobject/regIOobjectI.H
@@ -32,7 +32,7 @@ inline bool Foam::regIOobject::ownedByRegistry() const
 }
 
 
-void Foam::regIOobject::store()
+inline void Foam::regIOobject::store()
 {
     ownedByRegistry_ = true;
 }
@@ -74,18 +74,18 @@ inline Type& Foam::regIOobject::store(autoPtr<Type>& atPtr)
 }
 
 
-void Foam::regIOobject::release()
+inline void Foam::regIOobject::release()
 {
     ownedByRegistry_ = false;
 }
 
 
-Foam::label Foam::regIOobject::eventNo() const
+inline Foam::label Foam::regIOobject::eventNo() const
 {
     return eventNo_;
 }
 
-Foam::label& Foam::regIOobject::eventNo()
+inline Foam::label& Foam::regIOobject::eventNo()
 {
     return eventNo_;
 }