diff --git a/SabreTools.Library/Help/Feature.cs b/SabreTools.Library/Help/Feature.cs
index c1d71b97..238b6d02 100644
--- a/SabreTools.Library/Help/Feature.cs
+++ b/SabreTools.Library/Help/Feature.cs
@@ -515,14 +515,6 @@ namespace SabreTools.Library.Help
             if (!valid && !exact)
                 valid = this.Features.Keys.Any(k => this.Features[k].ValidateInput(input));
 
-            // If we're not valid at this point, we want to check if this flag is a file or a folder
-            if (!valid)
-                valid = File.Exists(input) || Directory.Exists(input);
-
-            // If we're not valid at this point, we weant to check if the flag is a wildcarded input
-            if (!valid)
-                valid = input.Contains("*") || input.Contains("?");
-
             return valid;
         }
 
diff --git a/SabreTools.Library/Help/TopLevel.cs b/SabreTools.Library/Help/TopLevel.cs
index 79ef8307..2c074b80 100644
--- a/SabreTools.Library/Help/TopLevel.cs
+++ b/SabreTools.Library/Help/TopLevel.cs
@@ -23,19 +23,27 @@ namespace SabreTools.Library.Help
                 // Verify that the current flag is proper for the feature
                 if (!ValidateInput(args[i]))
                 {
-                    Globals.Logger.Error($"Invalid input detected: {args[i]}");
-                    help.OutputIndividualFeature(this.Name);
-                    Globals.Logger.Close();
-                    return false;
+                    // Special precautions for files and directories
+                    if (File.Exists(args[i]) || Directory.Exists(args[i]))
+                    {
+                        Inputs.Add(args[i]);
+                    }
+
+                    // Special precautions for wildcarded inputs (potential paths)
+                    else if (args[i].Contains("*") || args[i].Contains("?"))
+                    {
+                        Inputs.Add(args[i]);
+                    }
+
+                    // Everything else isn't a file
+                    else
+                    {
+                        Globals.Logger.Error($"Invalid input detected: {args[i]}");
+                        help.OutputIndividualFeature(this.Name);
+                        Globals.Logger.Close();
+                        return false;
+                    }
                 }
-
-                // Special precautions for files and directories
-                if (File.Exists(args[i]) || Directory.Exists(args[i]))
-                    Inputs.Add(args[i]);
-
-                // Special precautions for wildcarded inputs (potential paths)
-                if (args[i].Contains("*") || args[i].Contains("?"))
-                    Inputs.Add(args[i]);
             }
 
             return true;