From 7a48efec4a96fa59c1a3fca76e34962c1623156a Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Mon, 24 Jun 2013 12:19:08 +0400
Subject: [PATCH] EA-46351 - IAE: FileTypeManager.associatePattern

---
 .../src/com/intellij/openapi/fileTypes/ex/FileTypeChooser.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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