diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateFieldAction.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateFieldAction.cs
index cea7c105ab..9932fbd614 100644
--- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateFieldAction.cs
+++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateFieldAction.cs
@@ -195,8 +195,8 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 			}
 			
 			if (expr.Parent is ReturnStatement) {
-				var state = resolver.GetResolverStateBefore(expr);
-				if (state != null)
+				var state = resolver.GetResolverStateBefore(expr.Parent);
+				if (state != null  && state.CurrentMember != null)
 					return new [] { state.CurrentMember.ReturnType };
 			}