diff --git a/EnvelopeGenerator.ServiceHost/Program.cs b/EnvelopeGenerator.ServiceHost/Program.cs
index 9fe2688e..e30fdd12 100644
--- a/EnvelopeGenerator.ServiceHost/Program.cs
+++ b/EnvelopeGenerator.ServiceHost/Program.cs
@@ -3,6 +3,7 @@ using EnvelopeGenerator.Application;
 using EnvelopeGenerator.Infrastructure;
 using EnvelopeGenerator.ServiceHost;
 using EnvelopeGenerator.ServiceHost.Extensions;
+using EnvelopeGenerator.ServiceHost.Middleware;
 using Microsoft.AspNetCore.Localization;
 using Microsoft.EntityFrameworkCore;
 using System.Globalization;
@@ -15,12 +16,12 @@ if (builder.Configuration.GetValue<bool>("UseWindowsService"))
     builder.Host.UseWindowsService();
 }
 
-if (builder.Configuration.GetValue<bool>("UseKestrelConfig"))
+if (builder.Configuration.GetValue<bool>("UseCustomKestrelEndpoints"))
 {
     builder.WebHost.ConfigureKestrel((context, serverOptions) =>
     {
-        var kestrelSection = context.Configuration.GetSection("Kestrel");
-        serverOptions.Configure(kestrelSection);
+        var serverConfigSection = context.Configuration.GetSection("ServerConfig");
+        serverOptions.Configure(serverConfigSection);
     });
 }
 #endregion
@@ -65,6 +66,8 @@ builder.Services.AddSwaggerGen();
 
 var app = builder.Build();
 
+app.UseMiddleware<ExceptionHandlingMiddleware>();
+
 // Configure the HTTP request pipeline.
 if (app.Environment.IsDevelopment())
 {
diff --git a/EnvelopeGenerator.ServiceHost/appsettings.json b/EnvelopeGenerator.ServiceHost/appsettings.json
index 9373f8f9..d64c4a0c 100644
--- a/EnvelopeGenerator.ServiceHost/appsettings.json
+++ b/EnvelopeGenerator.ServiceHost/appsettings.json
@@ -14,8 +14,8 @@
     "Default": "Server=SDD-VMP04-SQL17\\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=dd;Encrypt=false;TrustServerCertificate=True;"
   },
   "UseWindowsService": false,
-  "UseKestrelConfig": false,
-  "Kestrel": {
+  "UseCustomKestrelEndpoints": false,
+  "ServerConfig": {
     "Endpoints": {
       "Http": {
         "Url": "http://localhost:1111"