diff --git a/services/Archival/FilterLists.Archival.Api/Controllers/ErrorController.cs b/services/Archival/FilterLists.Archival.Api/Controllers/ErrorController.cs
index a4d53ae97..e57160e5b 100644
--- a/services/Archival/FilterLists.Archival.Api/Controllers/ErrorController.cs
+++ b/services/Archival/FilterLists.Archival.Api/Controllers/ErrorController.cs
@@ -19,7 +19,7 @@ public IActionResult ErrorLocalDevelopment([FromServices] IWebHostEnvironment we
             }
 
             var context = HttpContext.Features.Get<IExceptionHandlerFeature>();
-            return Problem(context.Error.StackTrace, title: context.Error.Message);
+            return Problem(context?.Error.StackTrace, title: context?.Error.Message);
         }
 
         [Route("/error")]
diff --git a/services/Directory/FilterLists.Directory.Api/Controllers/ErrorController.cs b/services/Directory/FilterLists.Directory.Api/Controllers/ErrorController.cs
index c3ff4cce6..ab9a6d0c3 100644
--- a/services/Directory/FilterLists.Directory.Api/Controllers/ErrorController.cs
+++ b/services/Directory/FilterLists.Directory.Api/Controllers/ErrorController.cs
@@ -19,7 +19,7 @@ public IActionResult ErrorLocalDevelopment([FromServices] IWebHostEnvironment we
             }
 
             var context = HttpContext.Features.Get<IExceptionHandlerFeature>();
-            return Problem(context.Error.StackTrace, title: context.Error.Message);
+            return Problem(context?.Error.StackTrace, title: context?.Error.Message);
         }
 
         [Route("/error")]