diff --git a/platform/platform-impl/src/com/intellij/openapi/fileTypes/ex/FileTypeChooser.java b/platform/platform-impl/src/com/intellij/openapi/fileTypes/ex/FileTypeChooser.java
index 41d31cb3f458..155f06a82f35 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileTypes/ex/FileTypeChooser.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileTypes/ex/FileTypeChooser.java
@@ -166,7 +166,7 @@ public class FileTypeChooser extends DialogWrapper {
     chooser.show();
     if (!chooser.isOK()) return null;
     final FileType type = chooser.getSelectedType();
-    if (type == FileTypes.UNKNOWN) return null;
+    if (type == FileTypes.UNKNOWN || type == null) return null;
 
     ApplicationManager.getApplication().runWriteAction(new Runnable() {
       @Override