From 44d6924ef4f4a033d20aaa44452a77245dfb2a13 Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Wed, 21 Nov 2012 18:11:29 +0100
Subject: [PATCH] EA-41206 - NPE:
 BaseExpressionToFieldHandler$ConvertToFieldRunnable.run (cherry picked from
 commit ed2a2c6f52d55255ddf5c69149335b45d1982586)

---
 .../introduceField/BaseExpressionToFieldHandler.java            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 5dee8e141119..7d8605533f07 100644
--- a/java/java-impl/src/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java
@@ -760,7 +760,7 @@ public abstract class BaseExpressionToFieldHandler extends IntroduceHandlerBase
             anchorElementHere = myAnchorElementIfOne;
           }
           assignStatement = createAssignment(myField, initializer, anchorElementHere, myParentClass);
-          if (!RefactoringUtil.isLoopOrIf(anchorElementHere.getParent())) {
+          if (anchorElementHere != null && !RefactoringUtil.isLoopOrIf(anchorElementHere.getParent())) {
             anchorElementHere.getParent().addBefore(assignStatement, getNormalizedAnchor(anchorElementHere));
           }
         }