diff --git a/src/object-manager.cc b/src/object-manager.cc
index 0733e22..ee24c7f 100644
--- a/src/object-manager.cc
+++ b/src/object-manager.cc
@@ -114,12 +114,15 @@
 
   sqlite3_int64 segment = 0;
   BytesPtr bytes = fileDb.fetchSegment (deviceName, 0);
-  while (bytes != BytesPtr())
+  while (bytes)
     {
       ParsedContentObject obj (*bytes);
       BytesPtr data = obj.contentPtr ();
 
-      off.write (reinterpret_cast<const char*> (head(*data)), data->size());
+      if (data)
+        {
+          off.write (reinterpret_cast<const char*> (head(*data)), data->size());
+        }
 
       segment ++;
       bytes = fileDb.fetchSegment (deviceName, segment);