diff --git a/src/Orchard/Localization/Text.cs b/src/Orchard/Localization/Text.cs index 538200b51..195fc2d63 100644 --- a/src/Orchard/Localization/Text.cs +++ b/src/Orchard/Localization/Text.cs @@ -24,12 +24,17 @@ namespace Orchard.Localization { Logger.Debug("{0} localizing '{1}'", _scope, textHint); var workContext = _workContextAccessor.GetContext(); - var currentCulture = workContext.CurrentCulture; - var localizedFormat = _localizedStringManager.GetLocalizedString(_scope, textHint, currentCulture); + + if (workContext != null) { + var currentCulture = workContext.CurrentCulture; + var localizedFormat = _localizedStringManager.GetLocalizedString(_scope, textHint, currentCulture); - return args.Length == 0 - ? new LocalizedString(localizedFormat, _scope, textHint, args) - : new LocalizedString(string.Format(GetFormatProvider(currentCulture), localizedFormat, args), _scope, textHint, args); + return args.Length == 0 + ? new LocalizedString(localizedFormat, _scope, textHint, args) + : new LocalizedString(string.Format(GetFormatProvider(currentCulture), localizedFormat, args), _scope, textHint, args); + } + + return new LocalizedString(textHint, _scope, textHint, args); } private static IFormatProvider GetFormatProvider(string currentCulture) {