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() { @Override public PsiElement fun(PsiElement e) { - return e instanceof PsiFileSystemItem ? e.getParent() : e; + return e instanceof PsiFileSystemItem && e.getParent() != null ? e.getParent() : e; } }).toSet(); }