2 files changed, 6 insertions, 2 deletions

diff --git a/src/unstable/cachebase.h b/src/unstable/cachebase.h
index 6cc3e77..af2884c 100644
--- a/src/unstable/cachebase.h
+++ b/src/unstable/cachebase.h
@@ -184,7 +184,8 @@ namespace Bu
             pEnt( rhs.pEnt ),
             pData( rhs.pData )
         {
-            pEnt->incRef();
+            if( pEnt )
+                pEnt->incRef();
         }
 
         virtual ~CachePtr()
@@ -228,7 +229,8 @@ namespace Bu
             kId = rhs.kId;
             pEnt = rhs.pEnt;
             pData = rhs.pData;
-            pEnt->incRef();
+            if( pEnt )
+                pEnt->incRef();
 
             return *this;
         }
@@ -513,6 +515,7 @@ namespace Bu
                     Entry *pEnt = hCacheEntry.get( i.getKey() );
                     Bu::MutexLocker ml( pEnt->getMutex() );
                     _save( pEnt->getPtr() );
+                    pEnt->getPtr()->changed( false );
                 }
                 hChanged.clear();
             }
diff --git a/src/unstable/uuid.cpp b/src/unstable/uuid.cpp
index a93f713..304ea4a 100644
--- a/src/unstable/uuid.cpp
+++ b/src/unstable/uuid.cpp
@@ -77,6 +77,7 @@ int Bu::Uuid::getVersion()
 
 void Bu::Uuid::clear()
 {
+    memset( data, 0, 16 );
     data[7] = msb(0);
 }