diff --git a/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs b/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs
index 237a722d8a..636768fde2 100644
--- a/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs
+++ b/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs
@@ -1261,8 +1261,8 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 						}
 					}
 					var isAsWrapper = new CompletionDataWrapper (this);
-					var def = isAsType.GetDefinition();
-					AddTypesAndNamespaces(isAsWrapper, GetState(), null, t => t.GetDefinition() != null && def != null && (isAsType == null || t.GetDefinition().IsDerivedFrom(def)), m => false);
+					var def = isAsType != null ? isAsType.GetDefinition() : null;
+					AddTypesAndNamespaces(isAsWrapper, GetState(), null, t => t.GetDefinition() == null || def == null || t.GetDefinition().IsDerivedFrom(def), m => false);
 					return isAsWrapper.Result;
 //					{
 //						CompletionDataList completionList = new ProjectDomCompletionDataList ();