diff --git a/RombaSharp/RombaSharp.Inits.cs b/RombaSharp/RombaSharp.Inits.cs
index ad186d7c..25bc29bd 100644
--- a/RombaSharp/RombaSharp.Inits.cs
+++ b/RombaSharp/RombaSharp.Inits.cs
@@ -207,7 +207,6 @@ namespace RombaSharp
 		/// <param name="copy">True if files should be copied to output, false for rebuild</param>
 		/// <param name="workers">How many workers to launch for the job, default from config</param>
 		/// <param name="subworkers">How many subworkers to launch for each worker, default from config</param>
-		/// TODO: Verify implementation
 		private static void InitBuild(
 			List<string> inputs,
 			string outdat,
diff --git a/RombaSharp/RombaSharp.cs b/RombaSharp/RombaSharp.cs
index 87f5144f..9467b6d0 100644
--- a/RombaSharp/RombaSharp.cs
+++ b/RombaSharp/RombaSharp.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 using SabreTools.Library.Data;
 using SabreTools.Library.Help;
@@ -164,17 +165,21 @@ namespace RombaSharp
 				// Verify that the current flag is proper for the feature
 				if (!_help[feature].ValidateInput(args[i]))
 				{
-					Globals.Logger.Error("Invalid input detected: {0}", args[i]);
-					_help.OutputIndividualFeature(feature);
-					Globals.Logger.Close();
-					return;
+					// Special cases for files
+					List<string> temp = new List<string>();
+					temp.Add(args[i]);
+					if (!File.Exists(args[i])
+						&& !Directory.Exists(args[i])
+						&& GetValidDats(temp).Count == 0)
+					{
+						Globals.Logger.Error("Invalid input detected: {0}", args[i]);
+						_help.OutputIndividualFeature(feature);
+						Globals.Logger.Close();
+						return;
+					}
 				}
 
-				// Special precautions for files and directories
-				if (File.Exists(args[i]) || Directory.Exists(args[i]))
-				{
-					inputs.Add(args[i]);
-				}
+				inputs.Add(args[i]);
 			}
 
 			// Now loop through all inputs