diff --git a/SabreTools.DatFiles/DatFileTool.cs b/SabreTools.DatFiles/DatFileTool.cs
index c2d19477..558422f6 100644
--- a/SabreTools.DatFiles/DatFileTool.cs
+++ b/SabreTools.DatFiles/DatFileTool.cs
@@ -31,6 +31,21 @@ namespace SabreTools.DatFiles
 
         #region Creation
 
+        /// <summary>
+        /// Create a generic DatFile to be used
+        /// </summary>
+        /// <returns>A default Logiqx DatFile</returns>
+        public static DatFile CreateDatFile()
+            => CreateDatFile(DatFormat.Logiqx, baseDat: null, quotes: true);
+
+        /// <summary>
+        /// Create a specific type of DatFile to be used based on a format
+        /// </summary>
+        /// <param name="datFormat">Format of the DAT to be created</param>
+        /// <returns>DatFile of the specific internal type</returns>
+        public static DatFile CreateDatFile(DatFormat datFormat)
+            => CreateDatFile(datFormat, baseDat: null, quotes: true);
+
         /// <summary>
         /// Create a specific type of DatFile to be used based on a format and a base DAT
         /// </summary>
@@ -38,7 +53,7 @@ namespace SabreTools.DatFiles
         /// <param name="baseDat">DatFile containing the information to use in specific operations</param>
         /// <param name="quotes">For relevant types, assume the usage of quotes</param>
         /// <returns>DatFile of the specific internal type that corresponds to the inputs</returns>
-        public static DatFile CreateDatFile(DatFormat? datFormat = null, DatFile? baseDat = null, bool quotes = true)
+        public static DatFile CreateDatFile(DatFormat datFormat, DatFile? baseDat, bool quotes)
         {
             return datFormat switch
             {
diff --git a/SabreTools.DatFiles/Parser.cs b/SabreTools.DatFiles/Parser.cs
index f513d466..4b753382 100644
--- a/SabreTools.DatFiles/Parser.cs
+++ b/SabreTools.DatFiles/Parser.cs
@@ -112,8 +112,8 @@ namespace SabreTools.DatFiles
             // Now parse the correct type of DAT
             try
             {
-                var parsingDatFile = DatFileTool.CreateDatFile(currentPathFormat, datFile, quotes);
-                parsingDatFile?.ParseFile(currentPath, indexId, keep, statsOnly: statsOnly, throwOnError: throwOnError);
+                DatFile parsingDatFile = DatFileTool.CreateDatFile(currentPathFormat, datFile, quotes);
+                parsingDatFile.ParseFile(currentPath, indexId, keep, statsOnly: statsOnly, throwOnError: throwOnError);
             }
             catch (Exception ex) when (!throwOnError)
             {
diff --git a/SabreTools.DatTools/Writer.cs b/SabreTools.DatTools/Writer.cs
index d2dfb986..cd7730ca 100644
--- a/SabreTools.DatTools/Writer.cs
+++ b/SabreTools.DatTools/Writer.cs
@@ -90,7 +90,8 @@ namespace SabreTools.DatTools
                     string outfile = outfiles[datFormat];
                     try
                     {
-                        DatFileTool.CreateDatFile(datFormat, datFile, quotes)?.WriteToFile(outfile, ignoreblanks, throwOnError);
+                        DatFile writingDatFile = DatFileTool.CreateDatFile(currentPathFormat, datFile, quotes);
+                        writingDatFile.WriteToFile(outfile, ignoreblanks, throwOnError);
                     }
                     catch (Exception ex) when (!throwOnError)
                     {