diff --git a/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileSystemTreeImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileSystemTreeImpl.java index 6f126820087e..a17fc4352091 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileSystemTreeImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileSystemTreeImpl.java @@ -426,7 +426,10 @@ public class FileSystemTreeImpl implements FileSystemTree { final Object object = ((DefaultMutableTreeNode)last).getUserObject(); if (object instanceof FileNodeDescriptor) { final FileElement element = ((FileNodeDescriptor)object).getElement(); - selection.add(element.getFile()); + final VirtualFile file = element.getFile(); + if (file != null) { + selection.add(file); + } } } }