Fix TryGetNextNonSwitchArgumentOrError.

2 files changed, 3 insertions, 2 deletions

diff --git a/src/WixToolset.Core/CommandLine/BuildCommand.cs b/src/WixToolset.Core/CommandLine/BuildCommand.cs
index 072accc3..fed95958 100644
--- a/src/WixToolset.Core/CommandLine/BuildCommand.cs
+++ b/src/WixToolset.Core/CommandLine/BuildCommand.cs
@@ -578,7 +578,7 @@ namespace WixToolset.Core.CommandLine
                         case "bindpath":
                         {
                             var value = parser.GetNextArgumentOrError(arg);
-                            if (this.TryParseBindPath(value, out var bindPath))
+                            if (value != null && this.TryParseBindPath(value, out var bindPath))
                             {
                                 this.BindPaths.Add(bindPath);
                                 return true;
diff --git a/src/WixToolset.Core/CommandLine/CommandLineParser.cs b/src/WixToolset.Core/CommandLine/CommandLineParser.cs
index 1438d820..e78da47e 100644
--- a/src/WixToolset.Core/CommandLine/CommandLineParser.cs
+++ b/src/WixToolset.Core/CommandLine/CommandLineParser.cs
@@ -138,9 +138,10 @@ namespace WixToolset.Core.CommandLine
         {
             var result = this.TryGetNextSwitchOrArgument(out arg);
 
-            if (!result && !this.IsSwitch(arg))
+            if (!result || this.IsSwitch(arg))
             {
                 this.ErrorArgument = arg ?? CommandLineParser.ExpectedArgument;
+                return false;
             }
 
             return result;