diff --git a/src/GitVersion.App.Tests/ArgumentParserTests.cs b/src/GitVersion.App.Tests/ArgumentParserTests.cs
index 850ba7342b..3f26dce25d 100644
--- a/src/GitVersion.App.Tests/ArgumentParserTests.cs
+++ b/src/GitVersion.App.Tests/ArgumentParserTests.cs
@@ -389,7 +389,7 @@ private static IEnumerable<TestCaseData> OverrideconfigWithInvalidOptionTestData
         };
         yield return new TestCaseData("unknown-option=25")
         {
-            ExpectedResult = "Could not parse /overrideconfig option: unknown-option=25. Unsupported 'key'."
+            ExpectedResult = "Could not parse /overrideconfig option: unknown-option=25. Unsupported key 'unknown-option'."
         };
     }
 
diff --git a/src/GitVersion.App/ArgumentParser.cs b/src/GitVersion.App/ArgumentParser.cs
index 8b1329831d..569e9c47f9 100644
--- a/src/GitVersion.App/ArgumentParser.cs
+++ b/src/GitVersion.App/ArgumentParser.cs
@@ -464,7 +464,7 @@ private static void ParseOverrideConfig(Arguments arguments, IReadOnlyCollection
             var optionKey = keyAndValue[0].ToLowerInvariant();
             if (!OverrideConfigurationOptionParser.SupportedProperties.Contains(optionKey))
             {
-                throw new WarningException($"Could not parse /overrideconfig option: {keyValueOption}. Unsupported 'key'.");
+                throw new WarningException($"Could not parse /overrideconfig option: {keyValueOption}. Unsupported key '{optionKey}'.");
             }
             parser.SetValue(optionKey, keyAndValue[1]);
         }