diff --git a/platform/lang-api/src/com/intellij/execution/RunnerAndConfigurationSettings.java b/platform/lang-api/src/com/intellij/execution/RunnerAndConfigurationSettings.java
index e2e2280a63fa..975a2e61051d 100644
--- a/platform/lang-api/src/com/intellij/execution/RunnerAndConfigurationSettings.java
+++ b/platform/lang-api/src/com/intellij/execution/RunnerAndConfigurationSettings.java
@@ -22,10 +22,21 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 /**
- * User: anna
- * Date: Jan 25, 2005
+ * Describes a complete persisted run configuration (as displayed in the Run/Debug Configurations dialog), together with runner-specific
+ * settings.
+ *
+ * @author anna
  */
 public interface RunnerAndConfigurationSettings {
+  /**
+   * Returns the type of the run configuration.
+   *
+   * @return the type of the run configuration, or null if the settings object was loaded from disk and no plugin corresponding to the
+   * stored type of the run configuration is loaded.
+   */
+  @Nullable
+  ConfigurationType getType();
+
   @Nullable
   ConfigurationFactory getFactory();
 
@@ -45,9 +56,6 @@ public interface RunnerAndConfigurationSettings {
   @Nullable
   ConfigurationPerRunnerSettings getConfigurationSettings(@NotNull ProgramRunner runner);
 
-  @Nullable
-  ConfigurationType getType();
-
   void checkSettings() throws RuntimeConfigurationException;
 
   void checkSettings(@Nullable Executor executor) throws RuntimeConfigurationException;
diff --git a/platform/lang-impl/src/com/intellij/execution/impl/RunnerAndConfigurationSettingsImpl.java b/platform/lang-impl/src/com/intellij/execution/impl/RunnerAndConfigurationSettingsImpl.java
index 7c67cb9f30ee..da2cf118495c 100644
--- a/platform/lang-impl/src/com/intellij/execution/impl/RunnerAndConfigurationSettingsImpl.java
+++ b/platform/lang-impl/src/com/intellij/execution/impl/RunnerAndConfigurationSettingsImpl.java
@@ -84,7 +84,7 @@ public class RunnerAndConfigurationSettingsImpl implements JDOMExternalizable, C
     myManager = manager;
   }
 
-  public RunnerAndConfigurationSettingsImpl(RunManagerImpl manager, RunConfiguration configuration, boolean isTemplate) {
+  public RunnerAndConfigurationSettingsImpl(RunManagerImpl manager, @NotNull RunConfiguration configuration, boolean isTemplate) {
     myManager = manager;
     myConfiguration = configuration;
     myIsTemplate = isTemplate;