diff --git a/.hgignore b/.hgignore
index f59589f44c..bbcd3f8e97 100644
--- a/.hgignore
+++ b/.hgignore
@@ -54,3 +54,4 @@ src/Umbraco.Web.UI/Views/*.cshtml
 src/Umbraco.Web.UI/Views/*.vbhtml
 src/Umbraco.Tests/config/umbracoSettings.config
 src/Umbraco.Web.UI/App_Plugins/*
+src/Umbraco.Web.UI/Views/*
diff --git a/src/Umbraco.Web/DefaultPublishedMediaStore.cs b/src/Umbraco.Web/DefaultPublishedMediaStore.cs
index 7a3e9a66f8..35a5b30c3f 100644
--- a/src/Umbraco.Web/DefaultPublishedMediaStore.cs
+++ b/src/Umbraco.Web/DefaultPublishedMediaStore.cs
@@ -70,8 +70,17 @@ namespace Umbraco.Web
 			var media = global::umbraco.library.GetMedia(id, true);
 			if (media != null && media.Current != null)
 			{
-				media.MoveNext();
-				return ConvertFromXPathNavigator(media.Current);
+				if (media.MoveNext())
+				{
+					var current = media.Current;
+					//error check
+					if (media.Current.MoveToFirstChild() && media.Current.Name.InvariantEquals("error"))
+					{
+						return null;
+					}
+
+					return ConvertFromXPathNavigator(current);
+				}				
 			}
 
 			return null;