diff --git a/java/java-impl/src/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java b/java/java-impl/src/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java
index ba351f2a8455..c46c15c4dda5 100644
--- a/java/java-impl/src/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java
@@ -400,7 +400,7 @@ public abstract class BaseExpressionToFieldHandler extends IntroduceHandlerBase
     return RefactoringUtil.getTypeByExpressionWithExpectedType(expr);
   }
 
-  public PsiClass getParentClass(PsiExpression initializerExpression) {
+  public PsiClass getParentClass(@NotNull PsiExpression initializerExpression) {
     PsiElement element = initializerExpression.getUserData(ElementToWorkOn.PARENT);
     if (element == null) element = initializerExpression.getParent();
     PsiElement parent = element;
diff --git a/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceConstantHandler.java b/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceConstantHandler.java
index 8c9a56f658f1..027e811d0ccc 100644
--- a/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceConstantHandler.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceConstantHandler.java
@@ -161,7 +161,7 @@ public class IntroduceConstantHandler extends BaseExpressionToFieldHandler {
 
   @Nullable
   private PsiElement isStaticFinalInitializer(PsiExpression expr) {
-    PsiClass parentClass = getParentClass(expr);
+    PsiClass parentClass = expr != null ? getParentClass(expr) : null;
     if (parentClass == null) return null;
     IsStaticFinalInitializerExpression visitor = new IsStaticFinalInitializerExpression(parentClass, expr);
     expr.accept(visitor);
@@ -212,7 +212,7 @@ public class IntroduceConstantHandler extends BaseExpressionToFieldHandler {
     }
   }
 
-  public PsiClass getParentClass(PsiExpression initializerExpression) {
+  public PsiClass getParentClass(@NotNull PsiExpression initializerExpression) {
     final PsiType type = initializerExpression.getType();
 
     if (type != null && PsiUtil.isConstantExpression(initializerExpression)) {