diff --git a/ICSharpCode.NRefactory/CSharp/Parser/CSharpParser.cs b/ICSharpCode.NRefactory/CSharp/Parser/CSharpParser.cs
index bcda63889d..a817d50833 100644
--- a/ICSharpCode.NRefactory/CSharp/Parser/CSharpParser.cs
+++ b/ICSharpCode.NRefactory/CSharp/Parser/CSharpParser.cs
@@ -1739,7 +1739,7 @@ namespace ICSharpCode.NRefactory.CSharp
 			
 			void AddTypeArguments (DomNode parent, LocationsBag.MemberLocations location, Mono.CSharp.TypeArguments typeArguments)
 			{
-				if (typeArguments == null)
+				if (typeArguments == null || typeArguments.IsEmpty)
 					return;
 				for (int i = 0; i < typeArguments.Count; i++) {
 					if (location != null && i > 0 && i - 1 < location.Count)
@@ -1753,7 +1753,7 @@ namespace ICSharpCode.NRefactory.CSharp
 			
 			void AddTypeArguments (DomNode parent, List<Location> location, Mono.CSharp.TypeArguments typeArguments)
 			{
-				if (typeArguments == null)
+				if (typeArguments == null || typeArguments.IsEmpty)
 					return;
 				for (int i = 0; i < typeArguments.Count; i++) {
 					if (location != null && i > 0 && i - 1 < location.Count)