diff --git a/platform/platform-api/src/com/intellij/openapi/options/ConfigurationException.java b/platform/platform-api/src/com/intellij/openapi/options/ConfigurationException.java
index dc4af6e3a438..ce5322937568 100644
--- a/platform/platform-api/src/com/intellij/openapi/options/ConfigurationException.java
+++ b/platform/platform-api/src/com/intellij/openapi/options/ConfigurationException.java
@@ -15,6 +15,9 @@
  */
 package com.intellij.openapi.options;
 
+import com.intellij.util.nls.NlsContexts;
+import org.jetbrains.annotations.Nls;
+
 /**
  * Thrown to indicate that a configurable component cannot {@link UnnamedConfigurable#apply() apply} entered values.
  */
@@ -26,7 +29,7 @@ public class ConfigurationException extends Exception {
   /**
    * @param message the detail message describing the problem
    */
-  public ConfigurationException(String message) {
+  public ConfigurationException(@Nls @NlsContexts.ConfigurationErrorMessage String message) {
     super(message);
   }
 
@@ -34,12 +37,15 @@ public class ConfigurationException extends Exception {
    * @param message the detailed message describing the problem
    * @param title   the title describing the problem in short
    */
-  public ConfigurationException(String message, String title) {
+  public ConfigurationException(@Nls @NlsContexts.ConfigurationErrorMessage String message,
+                                @Nls @NlsContexts.ConfigurationErrorTitle String title) {
     super(message);
     myTitle = title;
   }
 
-  public ConfigurationException(String message, Throwable cause, String title) {
+  public ConfigurationException(@Nls @NlsContexts.ConfigurationErrorMessage String message,
+                                Throwable cause,
+                                @Nls @NlsContexts.ConfigurationErrorTitle String title) {
     super(message, cause);
     myTitle = title;
   }
diff --git a/platform/platform-api/src/com/intellij/util/nls/NlsContexts.java b/platform/platform-api/src/com/intellij/util/nls/NlsContexts.java
index 37eb7ca7c773..331a1de8fca3 100644
--- a/platform/platform-api/src/com/intellij/util/nls/NlsContexts.java
+++ b/platform/platform-api/src/com/intellij/util/nls/NlsContexts.java
@@ -135,4 +135,16 @@ public class NlsContexts {
   @Target(ElementType.TYPE_USE)
   public @interface ValidationInfo {
   }
+
+  @NlsContext(prefix = "configuration.error.message")
+  @Nls(capitalization = Nls.Capitalization.Sentence)
+  @Target(ElementType.TYPE_USE)
+  public @interface ConfigurationErrorMessage {
+  }
+
+  @NlsContext(prefix = "configuration.error.title")
+  @Nls(capitalization = Nls.Capitalization.Sentence)
+  @Target(ElementType.TYPE_USE)
+  public @interface ConfigurationErrorTitle {
+  }
 }
\ No newline at end of file