dkumar7github
diff --git a/‎src/Presentation/SmartStore.Web.Framework/WebWorkContext.cs‎
Lines changed: 2 additions & 2 deletions b/‎src/Presentation/SmartStore.Web.Framework/WebWorkContext.cs‎
Lines changed: 2 additions & 2 deletions
@@ -238,7 +238,7 @@ public Language WorkingLanguage
                 }
 
                 #region Get language from URL (if possible)
-                if (_localizationSettings.SeoFriendlyUrlsForLanguagesEnabled && _httpContext != null)
+				if (_localizationSettings.SeoFriendlyUrlsForLanguagesEnabled && _httpContext != null && _httpContext.Request != null)
                 {
                     var helper = new LocalizedUrlHelper(_httpContext.Request, true);
                     string seoCode;
@@ -361,7 +361,7 @@ public Currency WorkingCurrency
                     }
 
 					// find currency by domain ending
-					if (currency == null)
+					if (currency == null && _httpContext != null && _httpContext.Request != null && _httpContext.Request.Url != null)
 					{
 						currency = _currencyService
 							.GetAllCurrencies(storeId: _storeContext.CurrentStore.Id)
Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ public Language WorkingLanguage`
`238`	`238`	`}`
`239`	`239`
`240`	`240`	`#region Get language from URL (if possible)`
`241`		`- if (_localizationSettings.SeoFriendlyUrlsForLanguagesEnabled && _httpContext != null)`
	`241`	`+ if (_localizationSettings.SeoFriendlyUrlsForLanguagesEnabled && _httpContext != null && _httpContext.Request != null)`
`242`	`242`	`{`
`243`	`243`	`var helper = new LocalizedUrlHelper(_httpContext.Request, true);`
`244`	`244`	`string seoCode;`
`@@ -361,7 +361,7 @@ public Currency WorkingCurrency`
`361`	`361`	`}`
`362`	`362`
`363`	`363`	`// find currency by domain ending`
`364`		`- if (currency == null)`
	`364`	`+ if (currency == null && _httpContext != null && _httpContext.Request != null && _httpContext.Request.Url != null)`
`365`	`365`	`{`
`366`	`366`	`currency = _currencyService`
`367`	`367`	`.GetAllCurrencies(storeId: _storeContext.CurrentStore.Id)`