From f7ddd1eb949e97833884c53fdc148d3307c68df3 Mon Sep 17 00:00:00 2001
From: Another Developer <kumards@users.noreply.github.com>
Date: Thu, 21 Sep 2017 15:07:09 -0400
Subject: [PATCH] Adding null check on workContextAccessor. (#7864)

Fixes #4623
---
 src/Orchard/Mvc/Extensions/UrlHelperExtensions.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Orchard/Mvc/Extensions/UrlHelperExtensions.cs b/src/Orchard/Mvc/Extensions/UrlHelperExtensions.cs
index c2fa4d568..5d5e31b72 100644
--- a/src/Orchard/Mvc/Extensions/UrlHelperExtensions.cs
+++ b/src/Orchard/Mvc/Extensions/UrlHelperExtensions.cs
@@ -31,7 +31,9 @@ namespace Orchard.Mvc.Extensions {
             
             if(String.IsNullOrEmpty(baseUrl)) {
                 var workContextAccessor = urlHelper.RequestContext.GetWorkContext();
-                baseUrl = workContextAccessor.CurrentSite.BaseUrl;
+                if (workContextAccessor != null) {
+                    baseUrl = workContextAccessor.CurrentSite.BaseUrl;
+                }
 
                 if (String.IsNullOrWhiteSpace(baseUrl)) {
                     baseUrl = urlHelper.RequestContext.HttpContext.Request.ToApplicationRootUrlString();