diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalOptionsConfigurable.java b/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalOptionsConfigurable.java
index db7846fa7c60..f699ce8166cf 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalOptionsConfigurable.java
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalOptionsConfigurable.java
@@ -61,6 +61,7 @@ public class TerminalOptionsConfigurable implements SearchableConfigurable, Conf
   @Override
   public JComponent createComponent() {
     myPanel = new TerminalSettingsPanel();
+    if (myProjectOptionsProvider == null) return new JPanel();
     return myPanel.createPanel(myOptionsProvider, myProjectOptionsProvider);
   }