diff --git a/src/AddIns/Misc/SharpRefactoring/Project/Src/GenerateCode.cs b/src/AddIns/Misc/SharpRefactoring/Project/Src/GenerateCode.cs
index 0284057163..d0b042a51d 100644
--- a/src/AddIns/Misc/SharpRefactoring/Project/Src/GenerateCode.cs
+++ b/src/AddIns/Misc/SharpRefactoring/Project/Src/GenerateCode.cs
@@ -195,7 +195,10 @@ namespace SharpRefactoring
 				if (isNew)
 					targetClass = info.CompilationUnit.Classes.FirstOrDefault(c => c.DotNetName == c.Namespace + "." + (result as string));
 				else
-					targetClass = info.CompilationUnit.Classes.FirstOrDefault(c => c.DotNetName == targetClass.DotNetName);
+					targetClass = info.CompilationUnit.Classes.Flatten(c => c.InnerClasses).FirstOrDefault(c => c.DotNetName == targetClass.DotNetName);
+				
+				if (targetClass == null)
+					return;
 				
 				if (IsEqualClass(rr.CallingClass, targetClass)) {
 					newMember = targetClass.GetInnermostMember(editor.Caret.Line, editor.Caret.Column);