diff --git a/src/Orchard/Mvc/HttpContextAccessor.cs b/src/Orchard/Mvc/HttpContextAccessor.cs
index 34f50c7a9..8fe8e4f0a 100644
--- a/src/Orchard/Mvc/HttpContextAccessor.cs
+++ b/src/Orchard/Mvc/HttpContextAccessor.cs
@@ -21,7 +21,8 @@ namespace Orchard.Mvc {
 
         public HttpContextBase CreateContext(ILifetimeScope lifetimeScope) {
             return new MvcModule.HttpContextPlaceholder(_threadStaticContexts, _contextKey, () => {
-                return lifetimeScope.Resolve<ISiteService>().GetSiteSettings().BaseUrl;
+                var baseUrl = lifetimeScope.Resolve<ISiteService>().GetSiteSettings().BaseUrl;
+                return !String.IsNullOrEmpty(baseUrl) ? baseUrl : "http://localhost"; // Return a valid URL always.
             });
         }