From 6d293c6ffd783ffe8ec8a2bcb510fb398523bf6c Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 8 Mar 2021 21:37:31 +0100
Subject: [PATCH] Fixed null ref exception

---
 src/Umbraco.Web.Common/UmbracoContext/UmbracoContext.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.Common/UmbracoContext/UmbracoContext.cs b/src/Umbraco.Web.Common/UmbracoContext/UmbracoContext.cs
index 9589c9e545..83821cbab5 100644
--- a/src/Umbraco.Web.Common/UmbracoContext/UmbracoContext.cs
+++ b/src/Umbraco.Web.Common/UmbracoContext/UmbracoContext.cs
@@ -71,7 +71,9 @@ namespace Umbraco.Cms.Web.Common.UmbracoContext
         internal Guid UmbracoRequestId { get; }
 
         // lazily get/create a Uri for the current request
-        private Uri RequestUrl => _requestUrl ?? (_requestUrl = new Uri(_httpContextAccessor.HttpContext.Request.GetEncodedUrl()));
+        private Uri RequestUrl => _requestUrl ??= _httpContextAccessor.HttpContext is null
+            ? null
+            : new Uri(_httpContextAccessor.HttpContext.Request.GetEncodedUrl());
 
         /// <inheritdoc/>
         // set the urls lazily, no need to allocate until they are needed...