diff --git a/ICSharpCode.NRefactory/TypeSystem/Implementation/GetClassTypeReference.cs b/ICSharpCode.NRefactory/TypeSystem/Implementation/GetClassTypeReference.cs
index 527eac9972..666b17f4b3 100644
--- a/ICSharpCode.NRefactory/TypeSystem/Implementation/GetClassTypeReference.cs
+++ b/ICSharpCode.NRefactory/TypeSystem/Implementation/GetClassTypeReference.cs
@@ -100,7 +100,7 @@ namespace ICSharpCode.NRefactory.TypeSystem.Implementation
 				}
 				if (type == null) {
 					var compilation = context.Compilation;
-					foreach (var asm in new[] { context.CurrentAssembly }.Concat(compilation.Assemblies)) {
+					foreach (var asm in (context.CurrentAssembly != null ? new[] { context.CurrentAssembly }.Concat(compilation.Assemblies) : compilation.Assemblies)) {
 						type = asm.GetTypeDefinition(fullTypeName);
 						if (type != null)
 							break;