diff --git a/SabreTools.Serialization/Wrappers/AACSMediaKeyBlock.cs b/SabreTools.Serialization/Wrappers/AACSMediaKeyBlock.cs
index 20607e73..dfee97c4 100644
--- a/SabreTools.Serialization/Wrappers/AACSMediaKeyBlock.cs
+++ b/SabreTools.Serialization/Wrappers/AACSMediaKeyBlock.cs
@@ -69,13 +69,13 @@ namespace SabreTools.Serialization.Wrappers
             if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
                 return null;
 
-            var mediaKeyBlock = Deserializers.AACS.DeserializeStream(data);
-            if (mediaKeyBlock == null)
-                return null;
-
             try
             {
-                return new AACSMediaKeyBlock(mediaKeyBlock, data);
+                var mkb = Deserializers.AACS.DeserializeStream(data);
+                if (mkb == null)
+                    return null;
+
+                return new AACSMediaKeyBlock(mkb, data);
             }
             catch
             {
diff --git a/SabreTools.Serialization/Wrappers/BDPlusSVM.cs b/SabreTools.Serialization/Wrappers/BDPlusSVM.cs
index 4d429f35..3b24a548 100644
--- a/SabreTools.Serialization/Wrappers/BDPlusSVM.cs
+++ b/SabreTools.Serialization/Wrappers/BDPlusSVM.cs
@@ -69,12 +69,12 @@ namespace SabreTools.Serialization.Wrappers
             if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
                 return null;
 
-            var svm = Deserializers.BDPlus.DeserializeStream(data);
-            if (svm == null)
-                return null;
-
             try
             {
+                var svm = Deserializers.BDPlus.DeserializeStream(data);
+                if (svm == null)
+                    return null;
+
                 return new BDPlusSVM(svm, data);
             }
             catch
diff --git a/SabreTools.Serialization/Wrappers/BFPK.cs b/SabreTools.Serialization/Wrappers/BFPK.cs
index f879e602..312d810c 100644
--- a/SabreTools.Serialization/Wrappers/BFPK.cs
+++ b/SabreTools.Serialization/Wrappers/BFPK.cs
@@ -59,12 +59,12 @@ namespace SabreTools.Serialization.Wrappers
             if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
                 return null;
 
-            var archive = Deserializers.BFPK.DeserializeStream(data);
-            if (archive == null)
-                return null;
-
             try
             {
+                var archive = Deserializers.BFPK.DeserializeStream(data);
+                if (archive == null)
+                    return null;
+
                 return new BFPK(archive, data);
             }
             catch
diff --git a/SabreTools.Serialization/Wrappers/BSP.cs b/SabreTools.Serialization/Wrappers/BSP.cs
index 4dfb67e0..7728f18a 100644
--- a/SabreTools.Serialization/Wrappers/BSP.cs
+++ b/SabreTools.Serialization/Wrappers/BSP.cs
@@ -60,12 +60,12 @@ namespace SabreTools.Serialization.Wrappers
             if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
                 return null;
 
-            var file = Deserializers.BSP.DeserializeStream(data);
-            if (file == null)
-                return null;
-
             try
             {
+                var file = Deserializers.BSP.DeserializeStream(data);
+                if (file == null)
+                    return null;
+
                 return new BSP(file, data);
             }
             catch
diff --git a/SabreTools.Serialization/Wrappers/CFB.cs b/SabreTools.Serialization/Wrappers/CFB.cs
index a5bd1a86..9a79b8c2 100644
--- a/SabreTools.Serialization/Wrappers/CFB.cs
+++ b/SabreTools.Serialization/Wrappers/CFB.cs
@@ -75,12 +75,12 @@ namespace SabreTools.Serialization.Wrappers
             if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
                 return null;
 
-            var binary = Deserializers.CFB.DeserializeStream(data);
-            if (binary == null)
-                return null;
-
             try
             {
+                var binary = Deserializers.CFB.DeserializeStream(data);
+                if (binary == null)
+                    return null;
+
                 return new CFB(binary, data);
             }
             catch
diff --git a/SabreTools.Serialization/Wrappers/CHD.cs b/SabreTools.Serialization/Wrappers/CHD.cs
index b344e811..a5c9c558 100644
--- a/SabreTools.Serialization/Wrappers/CHD.cs
+++ b/SabreTools.Serialization/Wrappers/CHD.cs
@@ -95,19 +95,19 @@ namespace SabreTools.Serialization.Wrappers
         /// Create a CHD header from a Stream
         /// </summary>
         /// <param name="data">Stream representing the archive</param>
-        /// <returns>An CHD header on success, null on failure</returns>
+        /// <returns>A CHD header on success, null on failure</returns>
         public static CHD? Create(Stream? data)
         {
             // If the data is invalid
             if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
                 return null;
 
-            var header = Deserializers.CHD.DeserializeStream(data);
-            if (header == null)
-                return null;
-
             try
             {
+                var header = Deserializers.CHD.DeserializeStream(data);
+                if (header == null)
+                    return null;
+
                 return new CHD(header, data);
             }
             catch
diff --git a/SabreTools.Serialization/Wrappers/CIA.cs b/SabreTools.Serialization/Wrappers/CIA.cs
index 4dbe5dec..a2debb17 100644
--- a/SabreTools.Serialization/Wrappers/CIA.cs
+++ b/SabreTools.Serialization/Wrappers/CIA.cs
@@ -60,13 +60,13 @@ namespace SabreTools.Serialization.Wrappers
             if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
                 return null;
 
-            var archive = Deserializers.CIA.DeserializeStream(data);
-            if (archive == null)
-                return null;
-
             try
             {
-                return new CIA(archive, data);
+                var cia = Deserializers.CIA.DeserializeStream(data);
+                if (cia == null)
+                    return null;
+
+                return new CIA(cia, data);
             }
             catch
             {
diff --git a/SabreTools.Serialization/Wrappers/GCF.cs b/SabreTools.Serialization/Wrappers/GCF.cs
index e0fc7b79..dae055ac 100644
--- a/SabreTools.Serialization/Wrappers/GCF.cs
+++ b/SabreTools.Serialization/Wrappers/GCF.cs
@@ -215,12 +215,12 @@ namespace SabreTools.Serialization.Wrappers
             if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
                 return null;
 
-            var file = Deserializers.GCF.DeserializeStream(data);
-            if (file == null)
-                return null;
-
             try
             {
+                var file = Deserializers.GCF.DeserializeStream(data);
+                if (file == null)
+                    return null;
+
                 return new GCF(file, data);
             }
             catch
diff --git a/SabreTools.Serialization/Wrappers/IRD.cs b/SabreTools.Serialization/Wrappers/IRD.cs
index 95c01d0f..24276f1b 100644
--- a/SabreTools.Serialization/Wrappers/IRD.cs
+++ b/SabreTools.Serialization/Wrappers/IRD.cs
@@ -59,13 +59,13 @@ namespace SabreTools.Serialization.Wrappers
             if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
                 return null;
 
-            var ird = Deserializers.IRD.DeserializeStream(data);
-            if (ird == null)
-                return null;
-
             try
             {
-                return new IRD(ird, data);
+                var file = Deserializers.IRD.DeserializeStream(data);
+                if (file == null)
+                    return null;
+
+                return new IRD(file, data);
             }
             catch
             {
diff --git a/SabreTools.Serialization/Wrappers/InstallShieldCabinet.cs b/SabreTools.Serialization/Wrappers/InstallShieldCabinet.cs
index cc85e728..3549eb0f 100644
--- a/SabreTools.Serialization/Wrappers/InstallShieldCabinet.cs
+++ b/SabreTools.Serialization/Wrappers/InstallShieldCabinet.cs
@@ -119,12 +119,12 @@ namespace SabreTools.Serialization.Wrappers
             if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
                 return null;
 
-            var cabinet = Deserializers.InstallShieldCabinet.DeserializeStream(data);
-            if (cabinet == null)
-                return null;
-
             try
             {
+                var cabinet = Deserializers.InstallShieldCabinet.DeserializeStream(data);
+                if (cabinet == null)
+                    return null;
+
                 return new InstallShieldCabinet(cabinet, data);
             }
             catch
diff --git a/SabreTools.Serialization/Wrappers/LinearExecutable.cs b/SabreTools.Serialization/Wrappers/LinearExecutable.cs
index 0f057e35..1cf7f5e8 100644
--- a/SabreTools.Serialization/Wrappers/LinearExecutable.cs
+++ b/SabreTools.Serialization/Wrappers/LinearExecutable.cs
@@ -60,12 +60,12 @@ namespace SabreTools.Serialization.Wrappers
             if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
                 return null;
 
-            var executable = Deserializers.LinearExecutable.DeserializeStream(data);
-            if (executable == null)
-                return null;
-
             try
             {
+                var executable = Deserializers.LinearExecutable.DeserializeStream(data);
+                if (executable == null)
+                    return null;
+
                 return new LinearExecutable(executable, data);
             }
             catch
diff --git a/SabreTools.Serialization/Wrappers/MSDOS.cs b/SabreTools.Serialization/Wrappers/MSDOS.cs
index b275439e..5bb94d1b 100644
--- a/SabreTools.Serialization/Wrappers/MSDOS.cs
+++ b/SabreTools.Serialization/Wrappers/MSDOS.cs
@@ -59,12 +59,12 @@ namespace SabreTools.Serialization.Wrappers
             if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
                 return null;
 
-            var executable = Deserializers.MSDOS.DeserializeStream(data);
-            if (executable == null)
-                return null;
-
             try
             {
+                var executable = Deserializers.MSDOS.DeserializeStream(data);
+                if (executable == null)
+                    return null;
+
                 return new MSDOS(executable, data);
             }
             catch
diff --git a/SabreTools.Serialization/Wrappers/MicrosoftCabinet.cs b/SabreTools.Serialization/Wrappers/MicrosoftCabinet.cs
index ae428b1b..754429d9 100644
--- a/SabreTools.Serialization/Wrappers/MicrosoftCabinet.cs
+++ b/SabreTools.Serialization/Wrappers/MicrosoftCabinet.cs
@@ -60,12 +60,12 @@ namespace SabreTools.Serialization.Wrappers
             if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
                 return null;
 
-            var cabinet = Deserializers.MicrosoftCabinet.DeserializeStream(data);
-            if (cabinet == null)
-                return null;
-
             try
             {
+                var cabinet = Deserializers.MicrosoftCabinet.DeserializeStream(data);
+                if (cabinet == null)
+                    return null;
+
                 return new MicrosoftCabinet(cabinet, data);
             }
             catch
diff --git a/SabreTools.Serialization/Wrappers/MoPaQ.cs b/SabreTools.Serialization/Wrappers/MoPaQ.cs
index dafcf65e..c114198b 100644
--- a/SabreTools.Serialization/Wrappers/MoPaQ.cs
+++ b/SabreTools.Serialization/Wrappers/MoPaQ.cs
@@ -59,12 +59,12 @@ namespace SabreTools.Serialization.Wrappers
             if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
                 return null;
 
-            var archive = Deserializers.MoPaQ.DeserializeStream(data);
-            if (archive == null)
-                return null;
-
             try
             {
+                var archive = Deserializers.MoPaQ.DeserializeStream(data);
+                if (archive == null)
+                    return null;
+
                 return new MoPaQ(archive, data);
             }
             catch
diff --git a/SabreTools.Serialization/Wrappers/N3DS.cs b/SabreTools.Serialization/Wrappers/N3DS.cs
index 027360bd..5c6110ae 100644
--- a/SabreTools.Serialization/Wrappers/N3DS.cs
+++ b/SabreTools.Serialization/Wrappers/N3DS.cs
@@ -25,7 +25,7 @@ namespace SabreTools.Serialization.Wrappers
         /// ExeFS headers
         /// </summary>
         public ExeFSHeader?[] ExeFSHeaders => Model.ExeFSHeaders ?? [];
-        
+
         /// <summary>
         /// Media unit size in bytes
         /// </summary>
@@ -254,13 +254,13 @@ namespace SabreTools.Serialization.Wrappers
             if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
                 return null;
 
-            var archive = Deserializers.N3DS.DeserializeStream(data);
-            if (archive == null)
-                return null;
-
             try
             {
-                return new N3DS(archive, data);
+                var cart = Deserializers.N3DS.DeserializeStream(data);
+                if (cart == null)
+                    return null;
+
+                return new N3DS(cart, data);
             }
             catch
             {
diff --git a/SabreTools.Serialization/Wrappers/NCF.cs b/SabreTools.Serialization/Wrappers/NCF.cs
index 90d33abb..faf300d6 100644
--- a/SabreTools.Serialization/Wrappers/NCF.cs
+++ b/SabreTools.Serialization/Wrappers/NCF.cs
@@ -59,12 +59,12 @@ namespace SabreTools.Serialization.Wrappers
             if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
                 return null;
 
-            var file = Deserializers.NCF.DeserializeStream(data);
-            if (file == null)
-                return null;
-
             try
             {
+                var file = Deserializers.NCF.DeserializeStream(data);
+                if (file == null)
+                    return null;
+
                 return new NCF(file, data);
             }
             catch
diff --git a/SabreTools.Serialization/Wrappers/NewExecutable.cs b/SabreTools.Serialization/Wrappers/NewExecutable.cs
index 2a4c5cd8..4e573fbc 100644
--- a/SabreTools.Serialization/Wrappers/NewExecutable.cs
+++ b/SabreTools.Serialization/Wrappers/NewExecutable.cs
@@ -60,12 +60,12 @@ namespace SabreTools.Serialization.Wrappers
             if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
                 return null;
 
-            var executable = Deserializers.NewExecutable.DeserializeStream(data);
-            if (executable == null)
-                return null;
-
             try
             {
+                var executable = Deserializers.NewExecutable.DeserializeStream(data);
+                if (executable == null)
+                    return null;
+
                 return new NewExecutable(executable, data);
             }
             catch
diff --git a/SabreTools.Serialization/Wrappers/Nitro.cs b/SabreTools.Serialization/Wrappers/Nitro.cs
index 5b95f0b7..75e44974 100644
--- a/SabreTools.Serialization/Wrappers/Nitro.cs
+++ b/SabreTools.Serialization/Wrappers/Nitro.cs
@@ -59,13 +59,13 @@ namespace SabreTools.Serialization.Wrappers
             if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
                 return null;
 
-            var archive = Deserializers.Nitro.DeserializeStream(data);
-            if (archive == null)
-                return null;
-
             try
             {
-                return new Nitro(archive, data);
+                var cart = Deserializers.Nitro.DeserializeStream(data);
+                if (cart == null)
+                    return null;
+
+                return new Nitro(cart, data);
             }
             catch
             {
diff --git a/SabreTools.Serialization/Wrappers/PAK.cs b/SabreTools.Serialization/Wrappers/PAK.cs
index 9f30a0fc..0edc4a9a 100644
--- a/SabreTools.Serialization/Wrappers/PAK.cs
+++ b/SabreTools.Serialization/Wrappers/PAK.cs
@@ -67,12 +67,12 @@ namespace SabreTools.Serialization.Wrappers
             if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
                 return null;
 
-            var file = Deserializers.PAK.DeserializeStream(data);
-            if (file == null)
-                return null;
-
             try
             {
+                var file = Deserializers.PAK.DeserializeStream(data);
+                if (file == null)
+                    return null;
+
                 return new PAK(file, data);
             }
             catch
diff --git a/SabreTools.Serialization/Wrappers/PFF.cs b/SabreTools.Serialization/Wrappers/PFF.cs
index 91b7482e..d155f0e5 100644
--- a/SabreTools.Serialization/Wrappers/PFF.cs
+++ b/SabreTools.Serialization/Wrappers/PFF.cs
@@ -72,12 +72,12 @@ namespace SabreTools.Serialization.Wrappers
             if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
                 return null;
 
-            var archive = Deserializers.PFF.DeserializeStream(data);
-            if (archive == null)
-                return null;
-
             try
             {
+                var archive = Deserializers.PFF.DeserializeStream(data);
+                if (archive == null)
+                    return null;
+
                 return new PFF(archive, data);
             }
             catch
diff --git a/SabreTools.Serialization/Wrappers/PIC.cs b/SabreTools.Serialization/Wrappers/PIC.cs
index a371cddb..ae6ef62e 100644
--- a/SabreTools.Serialization/Wrappers/PIC.cs
+++ b/SabreTools.Serialization/Wrappers/PIC.cs
@@ -34,13 +34,13 @@ namespace SabreTools.Serialization.Wrappers
         {
             // All logic is handled by the base class
         }
-        
+
         /// <summary>
-         /// Create a PIC disc information object from a byte array and offset
-         /// </summary>
-         /// <param name="data">Byte array representing the information</param>
-         /// <param name="offset">Offset within the array to parse</param>
-         /// <returns>A PIC disc information wrapper on success, null on failure</returns>
+        /// Create a PIC disc information object from a byte array and offset
+        /// </summary>
+        /// <param name="data">Byte array representing the information</param>
+        /// <param name="offset">Offset within the array to parse</param>
+        /// <returns>A PIC disc information wrapper on success, null on failure</returns>
         public static PIC? Create(byte[]? data, int offset)
         {
             // If the data is invalid
@@ -67,13 +67,14 @@ namespace SabreTools.Serialization.Wrappers
             if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
                 return null;
 
-            var info = Deserializers.PIC.DeserializeStream(data);
-            if (info == null)
-                return null;
-
             try
             {
-                return new PIC(info, data);
+
+                var di = Deserializers.PIC.DeserializeStream(data);
+                if (di == null)
+                    return null;
+
+                return new PIC(di, data);
             }
             catch
             {
diff --git a/SabreTools.Serialization/Wrappers/PKZIP.cs b/SabreTools.Serialization/Wrappers/PKZIP.cs
index 56443b8f..673c3469 100644
--- a/SabreTools.Serialization/Wrappers/PKZIP.cs
+++ b/SabreTools.Serialization/Wrappers/PKZIP.cs
@@ -60,12 +60,12 @@ namespace SabreTools.Serialization.Wrappers
             if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
                 return null;
 
-            var archive = Deserializers.PKZIP.DeserializeStream(data);
-            if (archive == null)
-                return null;
-
             try
             {
+                var archive = Deserializers.PKZIP.DeserializeStream(data);
+                if (archive == null)
+                    return null;
+
                 return new PKZIP(archive, data);
             }
             catch
diff --git a/SabreTools.Serialization/Wrappers/PlayJAudioFile.cs b/SabreTools.Serialization/Wrappers/PlayJAudioFile.cs
index 59512058..0e0c1bae 100644
--- a/SabreTools.Serialization/Wrappers/PlayJAudioFile.cs
+++ b/SabreTools.Serialization/Wrappers/PlayJAudioFile.cs
@@ -59,12 +59,12 @@ namespace SabreTools.Serialization.Wrappers
             if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
                 return null;
 
-            var audioFile = Deserializers.PlayJAudio.DeserializeStream(data);
-            if (audioFile == null)
-                return null;
-
             try
             {
+                var audioFile = Deserializers.PlayJAudio.DeserializeStream(data);
+                if (audioFile == null)
+                    return null;
+
                 return new PlayJAudioFile(audioFile, data);
             }
             catch
diff --git a/SabreTools.Serialization/Wrappers/PlayJPlaylist.cs b/SabreTools.Serialization/Wrappers/PlayJPlaylist.cs
index 086acaee..7b4a30b1 100644
--- a/SabreTools.Serialization/Wrappers/PlayJPlaylist.cs
+++ b/SabreTools.Serialization/Wrappers/PlayJPlaylist.cs
@@ -59,12 +59,12 @@ namespace SabreTools.Serialization.Wrappers
             if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
                 return null;
 
-            var playlist = Deserializers.PlayJPlaylist.DeserializeStream(data);
-            if (playlist == null)
-                return null;
-
             try
             {
+                var playlist = Deserializers.PlayJPlaylist.DeserializeStream(data);
+                if (playlist == null)
+                    return null;
+
                 return new PlayJPlaylist(playlist, data);
             }
             catch
diff --git a/SabreTools.Serialization/Wrappers/PortableExecutable.cs b/SabreTools.Serialization/Wrappers/PortableExecutable.cs
index cdeccc40..882fdac0 100644
--- a/SabreTools.Serialization/Wrappers/PortableExecutable.cs
+++ b/SabreTools.Serialization/Wrappers/PortableExecutable.cs
@@ -806,12 +806,12 @@ namespace SabreTools.Serialization.Wrappers
             if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
                 return null;
 
-            var executable = Deserializers.PortableExecutable.DeserializeStream(data);
-            if (executable == null)
-                return null;
-
             try
             {
+                var executable = Deserializers.PortableExecutable.DeserializeStream(data);
+                if (executable == null)
+                    return null;
+
                 return new PortableExecutable(executable, data);
             }
             catch
diff --git a/SabreTools.Serialization/Wrappers/Quantum.cs b/SabreTools.Serialization/Wrappers/Quantum.cs
index e2576674..5f714eaa 100644
--- a/SabreTools.Serialization/Wrappers/Quantum.cs
+++ b/SabreTools.Serialization/Wrappers/Quantum.cs
@@ -59,12 +59,12 @@ namespace SabreTools.Serialization.Wrappers
             if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
                 return null;
 
-            var archive = Deserializers.Quantum.DeserializeStream(data);
-            if (archive == null)
-                return null;
-
             try
             {
+                var archive = Deserializers.Quantum.DeserializeStream(data);
+                if (archive == null)
+                    return null;
+
                 return new Quantum(archive, data);
             }
             catch
diff --git a/SabreTools.Serialization/Wrappers/SGA.cs b/SabreTools.Serialization/Wrappers/SGA.cs
index 4b227783..b1cf2474 100644
--- a/SabreTools.Serialization/Wrappers/SGA.cs
+++ b/SabreTools.Serialization/Wrappers/SGA.cs
@@ -103,12 +103,12 @@ namespace SabreTools.Serialization.Wrappers
             if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
                 return null;
 
-            var file = Deserializers.SGA.DeserializeStream(data);
-            if (file == null)
-                return null;
-
             try
             {
+                var file = Deserializers.SGA.DeserializeStream(data);
+                if (file == null)
+                    return null;
+
                 return new SGA(file, data);
             }
             catch
diff --git a/SabreTools.Serialization/Wrappers/VBSP.cs b/SabreTools.Serialization/Wrappers/VBSP.cs
index c881fe8c..6bd999c6 100644
--- a/SabreTools.Serialization/Wrappers/VBSP.cs
+++ b/SabreTools.Serialization/Wrappers/VBSP.cs
@@ -60,12 +60,12 @@ namespace SabreTools.Serialization.Wrappers
             if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
                 return null;
 
-            var file = Deserializers.VBSP.DeserializeStream(data);
-            if (file == null)
-                return null;
-
             try
             {
+                var file = Deserializers.VBSP.DeserializeStream(data);
+                if (file == null)
+                    return null;
+
                 return new VBSP(file, data);
             }
             catch
diff --git a/SabreTools.Serialization/Wrappers/VPK.cs b/SabreTools.Serialization/Wrappers/VPK.cs
index c125d4ef..feba3b15 100644
--- a/SabreTools.Serialization/Wrappers/VPK.cs
+++ b/SabreTools.Serialization/Wrappers/VPK.cs
@@ -130,12 +130,12 @@ namespace SabreTools.Serialization.Wrappers
             if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
                 return null;
 
-            var file = Deserializers.VPK.DeserializeStream(data);
-            if (file == null)
-                return null;
-
             try
             {
+                var file = Deserializers.VPK.DeserializeStream(data);
+                if (file == null)
+                    return null;
+
                 return new VPK(file, data);
             }
             catch
diff --git a/SabreTools.Serialization/Wrappers/WAD3.cs b/SabreTools.Serialization/Wrappers/WAD3.cs
index 04a11cf8..b6e19d35 100644
--- a/SabreTools.Serialization/Wrappers/WAD3.cs
+++ b/SabreTools.Serialization/Wrappers/WAD3.cs
@@ -59,12 +59,12 @@ namespace SabreTools.Serialization.Wrappers
             if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
                 return null;
 
-            var file = Deserializers.WAD3.DeserializeStream(data);
-            if (file == null)
-                return null;
-
             try
             {
+                var file = Deserializers.WAD3.DeserializeStream(data);
+                if (file == null)
+                    return null;
+
                 return new WAD3(file, data);
             }
             catch
diff --git a/SabreTools.Serialization/Wrappers/XMID.cs b/SabreTools.Serialization/Wrappers/XMID.cs
index 0d60d5d0..9e02b4d1 100644
--- a/SabreTools.Serialization/Wrappers/XMID.cs
+++ b/SabreTools.Serialization/Wrappers/XMID.cs
@@ -87,14 +87,15 @@ namespace SabreTools.Serialization.Wrappers
             if (data == null || data.Length == 0)
                 return null;
 
-            var binary = Deserializers.XMID.DeserializeString(data);
-            if (binary == null)
-                return null;
-
             try
             {
+
+                var xmid = Deserializers.XMID.DeserializeString(data);
+                if (xmid == null)
+                    return null;
+
                 var ms = new MemoryStream(Encoding.ASCII.GetBytes(data));
-                return new XMID(binary, ms);
+                return new XMID(xmid, ms);
             }
             catch
             {
diff --git a/SabreTools.Serialization/Wrappers/XZP.cs b/SabreTools.Serialization/Wrappers/XZP.cs
index 8305097f..94051293 100644
--- a/SabreTools.Serialization/Wrappers/XZP.cs
+++ b/SabreTools.Serialization/Wrappers/XZP.cs
@@ -60,12 +60,12 @@ namespace SabreTools.Serialization.Wrappers
             if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
                 return null;
 
-            var file = Deserializers.XZP.DeserializeStream(data);
-            if (file == null)
-                return null;
-
             try
             {
+                var file = Deserializers.XZP.DeserializeStream(data);
+                if (file == null)
+                    return null;
+
                 return new XZP(file, data);
             }
             catch
diff --git a/SabreTools.Serialization/Wrappers/XeMID.cs b/SabreTools.Serialization/Wrappers/XeMID.cs
index ba0181ec..da382871 100644
--- a/SabreTools.Serialization/Wrappers/XeMID.cs
+++ b/SabreTools.Serialization/Wrappers/XeMID.cs
@@ -102,14 +102,14 @@ namespace SabreTools.Serialization.Wrappers
             if (data == null || data.Length == 0)
                 return null;
 
-            var binary = Deserializers.XeMID.DeserializeString(data);
-            if (binary == null)
-                return null;
-
             try
             {
+                var xemid = Deserializers.XeMID.DeserializeString(data);
+                if (xemid == null)
+                    return null;
+
                 var ms = new MemoryStream(Encoding.ASCII.GetBytes(data));
-                return new XeMID(binary, ms);
+                return new XeMID(xemid, ms);
             }
             catch
             {