1 files changed, 17 insertions, 7 deletions

diff --git a/src/cache.h b/src/cache.h
index 896aa71..dc5ab39 100644
--- a/src/cache.h
+++ b/src/cache.h
@@ -318,16 +318,26 @@ namespace Bu
                                         printf("Shouldn't erase, references still exist!\n");
                                         return;
                                 }
+
+                                obtype *pObj = hEnt.get( cId ).pData;
+                                pCalc->onDestroy( pObj, cId );
+                                hEnt.erase( cId );
+
+                                pStore->destroy( pObj, cId );
                         }
                         catch( Bu::HashException &e ) {
-                                get( cId );
-                        }
-
-                        obtype *pObj = hEnt.get( cId ).pData;
-                        pCalc->onDestroy( pObj, cId );
-                        hEnt.erase( cId );
+                                pCalc->onDestroy( cId );
 
-                        pStore->destroy( pObj, cId );
+                                if( hEnt.has( cId ) )
+                                {
+                                        // The object was loaded by onDestroy
+                                        erase( cId );
+                                }
+                                else
+                                {
+                                        pStore->destroy( cId );
+                                }
+                        }
                 }
 
                 typedef Bu::List<keytype> KeyList;