diff --git a/java/execution/impl/src/com/intellij/execution/JavaRunConfigurationExtensionManager.java b/java/execution/impl/src/com/intellij/execution/JavaRunConfigurationExtensionManager.java
index 556027008efd..9ea8e4058f13 100644
--- a/java/execution/impl/src/com/intellij/execution/JavaRunConfigurationExtensionManager.java
+++ b/java/execution/impl/src/com/intellij/execution/JavaRunConfigurationExtensionManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2011 JetBrains s.r.o.
+ * Copyright 2000-2014 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@ package com.intellij.execution;
 
 import com.intellij.execution.configuration.RunConfigurationExtensionsManager;
 import com.intellij.execution.configurations.RunConfigurationBase;
-import com.intellij.execution.configurations.RuntimeConfigurationException;
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.diagnostic.Logger;
 
@@ -26,7 +25,7 @@ import com.intellij.openapi.diagnostic.Logger;
  * Date: 10/4/11
  */
 public class JavaRunConfigurationExtensionManager extends RunConfigurationExtensionsManager<RunConfigurationBase, RunConfigurationExtension> {
-  private static final Logger LOG = Logger.getInstance("#" + RunConfigurationExtension.class.getName());
+  private static final Logger LOG = Logger.getInstance(RunConfigurationExtension.class);
 
   public JavaRunConfigurationExtensionManager() {
     super(RunConfigurationExtension.EP_NAME);
@@ -36,7 +35,7 @@ public class JavaRunConfigurationExtensionManager extends RunConfigurationExtens
      return ServiceManager.getService(JavaRunConfigurationExtensionManager.class);
    }
 
-  public static void checkConfigurationIsValid(RunConfigurationBase configuration) throws RuntimeConfigurationException {
+  public static void checkConfigurationIsValid(RunConfigurationBase configuration) {
     try {
       getInstance().validateConfiguration(configuration, false);
     }
diff --git a/platform/lang-impl/src/com/intellij/execution/configuration/EnvironmentVariablesComponent.java b/platform/lang-impl/src/com/intellij/execution/configuration/EnvironmentVariablesComponent.java
index 4375e164fed4..fa4630b6124a 100644
--- a/platform/lang-impl/src/com/intellij/execution/configuration/EnvironmentVariablesComponent.java
+++ b/platform/lang-impl/src/com/intellij/execution/configuration/EnvironmentVariablesComponent.java
@@ -102,7 +102,7 @@ public class EnvironmentVariablesComponent extends LabeledComponent<TextFieldWit
     }
   }
 
-  public static void writeExternal(Element element, Map<String, String> envs) {
+  public static void writeExternal(@NotNull Element element, @NotNull Map<String, String> envs) {
     final Element envsElement = new Element(ENVS);
     for (String envName : envs.keySet()) {
       final Element envElement = new Element(ENV);