diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 5f82700e9c..400dc3642d 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -1734,7 +1734,7 @@ void DomainServer::processOctreeDataPersistMessage(QSharedPointer<ReceivedMessag
         f.write(data);
         OctreeUtils::RawEntityData entityData;
         if (entityData.readOctreeDataInfoFromData(data)) {
-            qCDebug(domain_server) << "Wrote new entities file" << entityData.id << entityData.version;
+            qCDebug(domain_server) << "Wrote new entities file" << entityData.id << entityData.dataVersion;
         } else {
             qCDebug(domain_server) << "Failed to read new octree data info";
         }
diff --git a/libraries/octree/src/OctreeEntitiesFileParser.cpp b/libraries/octree/src/OctreeEntitiesFileParser.cpp
index 2f03eda286..e82201adfd 100644
--- a/libraries/octree/src/OctreeEntitiesFileParser.cpp
+++ b/libraries/octree/src/OctreeEntitiesFileParser.cpp
@@ -97,7 +97,7 @@ bool OctreeEntitiesFileParser::parseEntities(QVariantMap& parsedEntities) {
                 _errorString = "Duplicate Id entries";
                 return false;
             }
-
+            gotId = true;
             if (nextToken() != '"') {
                 _errorString = "Invalid Id value";
                 return false;
@@ -107,14 +107,21 @@ bool OctreeEntitiesFileParser::parseEntities(QVariantMap& parsedEntities) {
                 _errorString = "Invalid Id string";
                 return false;
             }
-            QUuid idValue = QUuid::fromString(QLatin1String(idString.c_str()) );
-            if (idValue.isNull()) {
-                _errorString = "Id value invalid UUID string: " + idString;
-                return false;
-            }
 
-            parsedEntities["Id"] = idValue;
-            gotId = true;
+            // some older archives may have a null string id, so
+            // return success without setting parsedEntities,
+            // which will result in a new uuid for the restored
+            // archive.  (not parsing and using isNull as parsing
+            // results in null if there is a corrupt string)
+
+            if (idString != "{00000000-0000-0000-0000-000000000000}") {
+                QUuid idValue = QUuid::fromString(QLatin1String(idString.c_str()) );
+                if (idValue.isNull()) {
+                    _errorString = "Id value invalid UUID string: " + idString;
+                    return false;
+                }
+                parsedEntities["Id"] = idValue;
+            }
         } else if (key == "Version") {
             if (gotVersion) {
                 _errorString = "Duplicate Version entries";