diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlView.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlView.cs
index e048d926a9..3f7bb979c9 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlView.cs
+++ b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlView.cs
@@ -762,7 +762,9 @@ namespace ICSharpCode.XmlEditor
 		/// </summary>
 		void DocumentChanged(object sender, DocumentEventArgs e)
 		{
-			this.PrimaryFile.MakeDirty();
+			if (PrimaryFile != null) {
+				PrimaryFile.MakeDirty();
+			}
 		}
 		
 		/// <summary>
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XslOutputView.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XslOutputView.cs
index f4a6c4d535..fcb0cfd9f4 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XslOutputView.cs
+++ b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XslOutputView.cs
@@ -18,7 +18,8 @@ namespace ICSharpCode.XmlEditor
 	{
 		public XslOutputView()
 		{
-			this.TitleName = StringParser.Parse("${res:ICSharpCode.XmlEditor.XslOutputView.Title}");
+			TitleName = StringParser.Parse("${res:ICSharpCode.XmlEditor.XslOutputView.Title}");
+			TextEditorControl.FileName = String.Empty;
 		}
 		
 		public static XslOutputView Instance {