From 6456f0b335c1a053cbc5883ba55fffff765abbbd Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Mon, 6 Oct 2014 19:14:24 +0200
Subject: [PATCH] EA-61050 - NPE: JavaSafeDeleteProcessor.findConflicts

---
 .../refactoring/safeDelete/JavaSafeDeleteProcessor.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/java-impl/src/com/intellij/refactoring/safeDelete/JavaSafeDeleteProcessor.java b/java/java-impl/src/com/intellij/refactoring/safeDelete/JavaSafeDeleteProcessor.java
index 807700bc52ae..f236f79473a8 100644
--- a/java/java-impl/src/com/intellij/refactoring/safeDelete/JavaSafeDeleteProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/safeDelete/JavaSafeDeleteProcessor.java
@@ -223,7 +223,7 @@ public class JavaSafeDeleteProcessor extends SafeDeleteProcessorDelegateBase {
     if (element instanceof PsiMethod) {
       final PsiClass containingClass = ((PsiMethod)element).getContainingClass();
 
-      if (!containingClass.hasModifierProperty(PsiModifier.ABSTRACT)) {
+      if (containingClass != null && !containingClass.hasModifierProperty(PsiModifier.ABSTRACT)) {
         final PsiMethod[] superMethods = ((PsiMethod) element).findSuperMethods();
         for (PsiMethod superMethod : superMethods) {
           if (isInside(superMethod, allElementsToDelete)) continue;