diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactConfigurable.java
index d75c33ebff05..39aa60543a40 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactConfigurable.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactConfigurable.java
@@ -123,7 +123,7 @@ public class ArtifactConfigurable extends ProjectStructureElementConfigurable<Ar
     artifactTypeBox.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent e) {
         final ArtifactType selected = (ArtifactType)artifactTypeBox.getSelectedItem();
-        if (!Comparing.equal(selected, getArtifact().getArtifactType())) {
+        if (selected != null && !Comparing.equal(selected, getArtifact().getArtifactType())) {
           myEditor.setArtifactType(selected);
         }
       }