diff --git a/DATFromDir/DATFromDir.cs b/DATFromDir/DATFromDir.cs
index 1072e049..e956fb49 100644
--- a/DATFromDir/DATFromDir.cs
+++ b/DATFromDir/DATFromDir.cs
@@ -456,13 +456,19 @@ namespace SabreTools
 				catch (InvalidOperationException)
 				{
 					encounteredErrors = true;
-					archive.Dispose();
+					if (archive != null)
+					{
+						archive.Dispose();
+					}
 				}
 				catch (Exception ex)
 				{
 					_logger.Error(ex.ToString());
 					encounteredErrors = true;
-					archive.Dispose();
+					if (archive != null)
+					{
+						archive.Dispose();
+					}
 				}
 			}
 
diff --git a/SabreHelper/Logger.cs b/SabreHelper/Logger.cs
index 9a885b69..969627f6 100644
--- a/SabreHelper/Logger.cs
+++ b/SabreHelper/Logger.cs
@@ -11,7 +11,7 @@ namespace SabreTools.Helper
 	/// - Create log files by date
 	/// - Clean up log files if there are more than x number per program
 	/// - Allow for "triggerable" logging done on an interval (async)
-	/// - Log filtering?
+	/// - Log filtering? (#if debug?)
 	/// </remarks>
 	public class Logger
 	{