diff --git a/src/Umbraco.Core/Services/LocalizedTextServiceExtensions.cs b/src/Umbraco.Core/Services/LocalizedTextServiceExtensions.cs
index dc20774142..2506d1b44d 100644
--- a/src/Umbraco.Core/Services/LocalizedTextServiceExtensions.cs
+++ b/src/Umbraco.Core/Services/LocalizedTextServiceExtensions.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 using System;
@@ -76,7 +76,7 @@ namespace Umbraco.Extensions
              if (text == null)
                  return null;
 
-             if (text.StartsWith("#") == false)
+             if (text.StartsWith("#") == false || text.IndexOf('_') == -1)
                  return text;
 
              text = text.Substring(1);
@@ -88,6 +88,9 @@ namespace Umbraco.Extensions
 
              var areaAndKey = text.Split('_');
 
+             if (areaAndKey.Length < 2) 
+                return text;
+
              value = manager.Localize(areaAndKey[0], areaAndKey[1]);
              return value.StartsWith("[") ? text : value;
          }
diff --git a/src/Umbraco.Infrastructure/Examine/MediaValueSetBuilder.cs b/src/Umbraco.Infrastructure/Examine/MediaValueSetBuilder.cs
index 446290f83f..4c745c8503 100644
--- a/src/Umbraco.Infrastructure/Examine/MediaValueSetBuilder.cs
+++ b/src/Umbraco.Infrastructure/Examine/MediaValueSetBuilder.cs
@@ -46,8 +46,6 @@ namespace Umbraco.Cms.Infrastructure.Examine
         {
             foreach (IMedia m in media)
             {
-                var umbracoFilePath = string.Empty;
-                var umbracoFile = string.Empty;
 
                 var urlValue = m.GetUrlSegment(_shortStringHelper, _urlSegmentProviders);
 
diff --git a/src/Umbraco.Web.UI.Client/src/installer/steps/error.html b/src/Umbraco.Web.UI.Client/src/installer/steps/error.html
index 4fb5823afa..aab5b18e9f 100644
--- a/src/Umbraco.Web.UI.Client/src/installer/steps/error.html
+++ b/src/Umbraco.Web.UI.Client/src/installer/steps/error.html
@@ -3,7 +3,7 @@
 
     <p class="message">{{installer.current.model.message}}</p>
 
-    <p><small>See the log for full details (logs can typically be found in the App_Data\Logs folder).</small></p>
+    <p><small>See the log for full details (logs can typically be found in the umbraco\Logs folder).</small></p>
 
     <button class="btn btn-success" ng-click="restart()">Go back</button>
 </div>