diff --git a/SabreTools.Serialization/Wrappers/XZ.cs b/SabreTools.Serialization/Wrappers/XZ.cs
index 3ada3fd6..755b25f8 100644
--- a/SabreTools.Serialization/Wrappers/XZ.cs
+++ b/SabreTools.Serialization/Wrappers/XZ.cs
@@ -73,7 +73,21 @@ namespace SabreTools.Serialization.Wrappers
             if (data == null || !data.CanRead)
                 return null;
 
-            return new XZ(new Archive(), data);
+            try
+            {
+                // Cache the current offset
+                long currentOffset = data.Position;
+
+                var model = new Readers.XZ().Deserialize(data);
+                if (model == null)
+                    return null;
+
+                return new XZ(model, data, currentOffset);
+            }
+            catch
+            {
+                return null;
+            }
         }
 
         #endregion