From 4b9d0941a46b41b7831fa12e81eefec4c9235ba0 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 10 Feb 2020 15:05:35 +0100
Subject: [PATCH] Fix if httpContext is null we cannot wrap it

---
 src/Umbraco.Web/Net/AspNetHttpContextAccessor.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/Net/AspNetHttpContextAccessor.cs b/src/Umbraco.Web/Net/AspNetHttpContextAccessor.cs
index c7270a8259..5d306e0692 100644
--- a/src/Umbraco.Web/Net/AspNetHttpContextAccessor.cs
+++ b/src/Umbraco.Web/Net/AspNetHttpContextAccessor.cs
@@ -9,7 +9,8 @@ namespace Umbraco.Web
         {
             get
             {
-                return new HttpContextWrapper(System.Web.HttpContext.Current);
+                var httpContext = System.Web.HttpContext.Current;
+                return httpContext is null ? null : new HttpContextWrapper(httpContext);
             }
             set
             {