diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/PsiUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/PsiUtil.java
index b8d8d2419342..da14556a1cee 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/PsiUtil.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/PsiUtil.java
@@ -543,7 +543,7 @@ public class PsiUtil {
       if (context instanceof GrTypeDefinition) {
         return (PsiClass)context;
       }
-      else if (context instanceof GroovyFileBase) {
+      else if (context instanceof GroovyFileBase && context.isPhysical()) {
         return ((GroovyFileBase)context).getScriptClass();
       }
 
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/java2groovy/OldReferencesResolver.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/java2groovy/OldReferencesResolver.java
index 13059b33361a..9947c4b0ca52 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/java2groovy/OldReferencesResolver.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/java2groovy/OldReferencesResolver.java
@@ -145,7 +145,7 @@ public class OldReferencesResolver {
       //newExpr = ((GrReferenceExpression)newExpr).getReferenceNameElement();
       final GroovyResolveResult adv = oldRef.advancedResolve();
       final PsiElement scope = getClassContainingResolve(adv);
-      final PsiElement owner = PsiTreeUtil.getContextOfType(oldExpr, PsiClass.class);
+      final PsiElement owner = PsiUtil.getContextClass(oldExpr);
 
       if (myToReplaceIn instanceof GrClosableBlock || (owner != null && scope != null && PsiTreeUtil.isContextAncestor(owner, scope, false))) {
 
@@ -368,7 +368,7 @@ public class OldReferencesResolver {
         return ((PsiMember)elem).getContainingClass();
       }
       else {
-        return PsiTreeUtil.getParentOfType(elem, PsiClass.class);
+        return PsiUtil.getContextClass(elem);
       }
     }
     return null;