From ae197ecf435eb2ff29405de26a44dd848b05d9a5 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Wed, 30 Dec 2015 17:40:58 +0100
Subject: [PATCH] Cleanup (NPE fix)

---
 .../com/intellij/refactoring/util/CommonRefactoringUtil.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/lang-api/src/com/intellij/refactoring/util/CommonRefactoringUtil.java b/platform/lang-api/src/com/intellij/refactoring/util/CommonRefactoringUtil.java
index ac2606665d72..22cc24d0cf53 100644
--- a/platform/lang-api/src/com/intellij/refactoring/util/CommonRefactoringUtil.java
+++ b/platform/lang-api/src/com/intellij/refactoring/util/CommonRefactoringUtil.java
@@ -110,7 +110,7 @@ public class CommonRefactoringUtil {
     return JBIterable.from(elements).transform(new Function<PsiElement, PsiElement>() {
       @Override
       public PsiElement fun(PsiElement e) {
-        return e instanceof PsiFileSystemItem ? e.getParent() : e;
+        return e instanceof PsiFileSystemItem && e.getParent() != null ? e.getParent() : e;
       }
     }).toSet();
   }