diff --git a/src/VirtoCommerce.WebHooksModule.Core/Extensions/DomainEventExtensions.cs b/src/VirtoCommerce.WebHooksModule.Core/Extensions/DomainEventExtensions.cs
index 27edcab..a3dc7b6 100644
--- a/src/VirtoCommerce.WebHooksModule.Core/Extensions/DomainEventExtensions.cs
+++ b/src/VirtoCommerce.WebHooksModule.Core/Extensions/DomainEventExtensions.cs
@@ -106,7 +106,7 @@ public static string ResolveDisplayName(string fullName)
                 displayName = fullName;
             }
 
-            return Regex.Replace(displayName, "[A-Z][a-z0-9_]+", "$0 ").Trim();
+            return Regex.Replace(displayName, "[A-Z][a-z0-9_]+", "$0 ", RegexOptions.Compiled).Trim();
         }
     }
 }
diff --git a/src/VirtoCommerce.WebHooksModule.Data/Services/RetriableWebHookSender.cs b/src/VirtoCommerce.WebHooksModule.Data/Services/RetriableWebHookSender.cs
index fce5969..e7375e4 100644
--- a/src/VirtoCommerce.WebHooksModule.Data/Services/RetriableWebHookSender.cs
+++ b/src/VirtoCommerce.WebHooksModule.Data/Services/RetriableWebHookSender.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
@@ -126,14 +125,14 @@ private WebhookSendResponse CreateSendResponse(HttpResponseMessage response, str
         {
             return new WebhookSendResponse()
             {
-                StatusCode = (int)(response?.StatusCode ?? 0),
+                StatusCode = (int)response.StatusCode,
                 ResponseParams = new WebhookHttpParams()
                 {
-                    Headers = response?.Headers.ToDictionary(x => x.Key, x => string.Join(";", x.Value)) ?? new Dictionary<string, string>(),
+                    Headers = response.Headers.ToDictionary(x => x.Key, x => string.Join(";", x.Value)),
                     Body = responseString
                 },
-                Error = response != null && response.IsSuccessStatusCode ? string.Empty: responseString,
-                IsSuccessfull = response?.IsSuccessStatusCode ?? false
+                Error = response.IsSuccessStatusCode ? string.Empty : responseString,
+                IsSuccessfull = response.IsSuccessStatusCode
             };
         }
 
diff --git a/src/VirtoCommerce.WebHooksModule.Data/Utils/WebHookFeedUtils.cs b/src/VirtoCommerce.WebHooksModule.Data/Utils/WebHookFeedUtils.cs
index be5ccff..eeb1a6d 100644
--- a/src/VirtoCommerce.WebHooksModule.Data/Utils/WebHookFeedUtils.cs
+++ b/src/VirtoCommerce.WebHooksModule.Data/Utils/WebHookFeedUtils.cs
@@ -26,11 +26,11 @@ public static WebhookFeedEntry CreateFeedEntry(WebhookFeedEntryType entryType, s
                 EventId = eventId,
                 AttemptCount = 0,
                 Error = new string(response.Error.Take(1024).ToArray()),
-                Status = response?.StatusCode ?? 0,
+                Status = response.StatusCode,
                 RequestHeaders = GetJsonString(webHook.RequestParams.Headers),
                 RequestBody = webHook.RequestParams.Body,
-                ResponseHeaders = GetJsonString(response?.ResponseParams?.Headers),
-                ResponseBody = response?.ResponseParams?.Body,
+                ResponseHeaders = GetJsonString(response.ResponseParams?.Headers),
+                ResponseBody = response.ResponseParams?.Body,
             };
 
             return result;