diff --git a/src/SoapCore.Tests/WsdlFromFile/WsdlIncludeTests.cs b/src/SoapCore.Tests/WsdlFromFile/WsdlIncludeTests.cs
index d5323299..a3e12c4c 100644
--- a/src/SoapCore.Tests/WsdlFromFile/WsdlIncludeTests.cs
+++ b/src/SoapCore.Tests/WsdlFromFile/WsdlIncludeTests.cs
@@ -110,7 +110,7 @@ public void CheckXSDIncludeXSD()
 			var addresses = _host.ServerFeatures.Get<IServerAddressesFeature>();
 			var address = addresses.Addresses.Single();
 
-			string url = address + "/Service.asmx?xsd&name=echoIncluded.xsd";
+			string url = address + "/Management/Service.asmx?xsd&name=echoIncluded.xsd";
 
 			Assert.IsNotNull(element);
 			Assert.AreEqual(url, element.Attributes["schemaLocation"]?.Value);
diff --git a/src/SoapCore/HeadersHelper.cs b/src/SoapCore/HeadersHelper.cs
index 0ecfc228..8770d3b4 100644
--- a/src/SoapCore/HeadersHelper.cs
+++ b/src/SoapCore/HeadersHelper.cs
@@ -145,8 +145,7 @@ public static string GetSoapAction(HttpContext httpContext, ref Message message)
 				}
 #endif
 
-				if (soapAction != null &&
-				    (GetTrimmedSoapAction(soapAction).Length == 0 || GetTrimmedClearedSoapAction(soapAction).Length == 0))
+				if (GetTrimmedSoapAction(soapAction).Length == 0 || GetTrimmedClearedSoapAction(soapAction).Length == 0)
 				{
 					soapAction = ReadOnlySpan<char>.Empty;
 				}
diff --git a/src/SoapCore/SoapEndpointMiddleware.cs b/src/SoapCore/SoapEndpointMiddleware.cs
index 69f98e7b..47d58689 100644
--- a/src/SoapCore/SoapEndpointMiddleware.cs
+++ b/src/SoapCore/SoapEndpointMiddleware.cs
@@ -1060,9 +1060,9 @@ private MetaFromFile GetMeta(HttpContext httpContext)
 				meta.CurrentWebServer = options.VirtualPath + "/";
 			}
 
-			meta.CurrentWebService = httpContext.Request.Path.Value.Replace("/", string.Empty);
-			var mapping = options.WebServiceWSDLMapping[meta.CurrentWebService];
-
+			string url = httpContext.Request.Path.Value.Replace("/", string.Empty);
+			var mapping = options.WebServiceWSDLMapping[url];
+			meta.CurrentWebService = string.IsNullOrEmpty(mapping.UrlOverride) ? url : mapping.UrlOverride;
 			meta.WSDLFolder = mapping.WSDLFolder;
 			meta.XsdFolder = mapping.SchemaFolder;
 			meta.ServerUrl = GetServerUrl(options, httpContext);
@@ -1135,15 +1135,7 @@ private async Task ProcessMetaFromFile(HttpContext httpContext, bool showDocumen
 				meta.CurrentWebServer = options.VirtualPath + "/";
 			}
 
-			if (string.IsNullOrEmpty(mapping.UrlOverride))
-			{
-				meta.CurrentWebService = url;
-			}
-			else
-			{
-				meta.CurrentWebService = mapping.UrlOverride;
-			}
-
+			meta.CurrentWebService = string.IsNullOrEmpty(mapping.UrlOverride) ? url : mapping.UrlOverride;
 			meta.WSDLFolder = mapping.WSDLFolder;
 			meta.XsdFolder = mapping.SchemaFolder;
 			meta.ServerUrl = GetServerUrl(options, httpContext);