diff --git a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/CompilationUnitCreatorVisitor.cs b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/CompilationUnitCreatorVisitor.cs
index 7c8c714634..3ed7c9d892 100644
--- a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/CompilationUnitCreatorVisitor.cs
+++ b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/CompilationUnitCreatorVisitor.cs
@@ -151,7 +151,9 @@ namespace ICSharpCode.XamlBinding
 				c.Modifiers |= ModifierEnum.Public;
 			
 			c.Region = CreateRegion(element.StartOffset, element.EndOffset);
-			c.BaseTypes.Add(TypeFromXmlNode(CompilationUnit, element));
+			var baseType = TypeFromXmlNode(CompilationUnit, element);
+			if (baseType != null)
+				c.BaseTypes.Add(baseType);
 			CompilationUnit.Classes.Add(c);
 
 			DefaultMethod initializeComponent = new DefaultMethod(
diff --git a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/CompletionDataHelper.cs b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/CompletionDataHelper.cs
index 91adc390ed..6aec28a8c5 100644
--- a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/CompletionDataHelper.cs
+++ b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/CompletionDataHelper.cs
@@ -264,7 +264,7 @@ namespace ICSharpCode.XamlBinding
 				
 				string key = string.IsNullOrEmpty(lastElement.Prefix) ? "" : lastElement.Prefix + ":";
 				
-				if (context.ParentElement.LocalName.StartsWith(lastElement.LocalName.TrimEnd('.'), StringComparison.OrdinalIgnoreCase)) {
+				if (context.ParentElement != null && context.ParentElement.LocalName.StartsWith(lastElement.LocalName.TrimEnd('.'), StringComparison.OrdinalIgnoreCase)) {
 					AddAttributes(rt, list, includeEvents);
 					AddAttachedProperties(rt.GetUnderlyingClass(), list, key, lastElement.Name.Trim('.'));
 				} else