diff --git a/java/execution/impl/src/com/intellij/execution/applet/AppletConfiguration.java b/java/execution/impl/src/com/intellij/execution/applet/AppletConfiguration.java
index d6921529547e..6773ac3029ff 100644
--- a/java/execution/impl/src/com/intellij/execution/applet/AppletConfiguration.java
+++ b/java/execution/impl/src/com/intellij/execution/applet/AppletConfiguration.java
@@ -103,6 +103,7 @@ public class AppletConfiguration extends ModuleBasedConfiguration<JavaRunConfigu
         return params;
       }
 
+      @NotNull
       protected OSProcessHandler startProcess() throws ExecutionException {
         final OSProcessHandler handler = super.startProcess();
         final AppletHtmlFile htmlUrl = myHtmlURL;
diff --git a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfiguration.java b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfiguration.java
index 5287087da48e..dbe5d0a0cc18 100644
--- a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfiguration.java
+++ b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfiguration.java
@@ -262,6 +262,7 @@ public class ApplicationConfiguration extends ModuleBasedConfiguration<JavaRunCo
       return params;
     }
 
+    @NotNull
     @Override
     protected OSProcessHandler startProcess() throws ExecutionException {
       final OSProcessHandler handler = super.startProcess();
diff --git a/java/execution/openapi/src/com/intellij/execution/configurations/JavaCommandLineState.java b/java/execution/openapi/src/com/intellij/execution/configurations/JavaCommandLineState.java
index 9118943650b3..48119d297d0d 100644
--- a/java/execution/openapi/src/com/intellij/execution/configurations/JavaCommandLineState.java
+++ b/java/execution/openapi/src/com/intellij/execution/configurations/JavaCommandLineState.java
@@ -37,6 +37,7 @@ public abstract class JavaCommandLineState extends CommandLineState implements J
     return myParams;
   }
 
+  @NotNull
   protected OSProcessHandler startProcess() throws ExecutionException {
     return JavaCommandLineStateUtil.startProcess(createCommandLine());
   }
diff --git a/java/execution/openapi/src/com/intellij/execution/configurations/JavaCommandLineStateUtil.java b/java/execution/openapi/src/com/intellij/execution/configurations/JavaCommandLineStateUtil.java
index 69647cc62b17..a2aacbb27fa4 100644
--- a/java/execution/openapi/src/com/intellij/execution/configurations/JavaCommandLineStateUtil.java
+++ b/java/execution/openapi/src/com/intellij/execution/configurations/JavaCommandLineStateUtil.java
@@ -28,6 +28,7 @@ public class JavaCommandLineStateUtil {
   private JavaCommandLineStateUtil() {
   }
 
+  @NotNull
   public static OSProcessHandler startProcess(@NotNull final GeneralCommandLine commandLine) throws ExecutionException {
     final DefaultJavaProcessHandler processHandler = new DefaultJavaProcessHandler(commandLine);
     ProcessTerminatedListener.attach(processHandler);
diff --git a/java/java-impl/src/com/intellij/javadoc/JavadocConfiguration.java b/java/java-impl/src/com/intellij/javadoc/JavadocConfiguration.java
index f8125312fef4..59a0d7b4632e 100644
--- a/java/java-impl/src/com/intellij/javadoc/JavadocConfiguration.java
+++ b/java/java-impl/src/com/intellij/javadoc/JavadocConfiguration.java
@@ -42,11 +42,9 @@ import com.intellij.openapi.projectRoots.ex.PathUtilEx;
 import com.intellij.openapi.roots.*;
 import com.intellij.openapi.util.*;
 import com.intellij.openapi.util.io.FileUtil;
-import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.*;
 import com.intellij.psi.jsp.JspFile;
-import com.intellij.util.Function;
 import com.intellij.util.PathsList;
 import com.intellij.util.containers.HashSet;
 import org.jdom.Element;
@@ -303,6 +301,7 @@ public class JavadocConfiguration implements ModuleRunProfile, JDOMExternalizabl
       }
     }
 
+    @NotNull
     protected OSProcessHandler startProcess() throws ExecutionException {
       final OSProcessHandler handler = JavaCommandLineStateUtil.startProcess(createCommandLine());
       ProcessTerminatedListener.attach(handler, myProject, JavadocBundle.message("javadoc.generate.exited"));
diff --git a/platform/lang-api/src/com/intellij/execution/configurations/CommandLineState.java b/platform/lang-api/src/com/intellij/execution/configurations/CommandLineState.java
index ea75268d6e7d..5d983a7f5bdb 100644
--- a/platform/lang-api/src/com/intellij/execution/configurations/CommandLineState.java
+++ b/platform/lang-api/src/com/intellij/execution/configurations/CommandLineState.java
@@ -60,6 +60,7 @@ public abstract class CommandLineState implements RunnableState {
     return new DefaultExecutionResult(console, processHandler, createActions(console, processHandler, executor));
   }
 
+  @NotNull
   protected abstract ProcessHandler startProcess() throws ExecutionException;
 
   protected AnAction[] createActions(final ConsoleView console, final ProcessHandler processHandler) {
diff --git a/platform/lang-api/src/com/intellij/execution/configurations/MockCommandLineState.java b/platform/lang-api/src/com/intellij/execution/configurations/MockCommandLineState.java
index 7ec78df3c3d8..92607dc5519a 100644
--- a/platform/lang-api/src/com/intellij/execution/configurations/MockCommandLineState.java
+++ b/platform/lang-api/src/com/intellij/execution/configurations/MockCommandLineState.java
@@ -17,11 +17,9 @@
 package com.intellij.execution.configurations;
 
 import com.intellij.execution.ExecutionException;
-import com.intellij.execution.configurations.CommandLineState;
 import com.intellij.execution.process.OSProcessHandler;
 import com.intellij.execution.runners.ExecutionEnvironment;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 /**
  * @author oleg
@@ -32,7 +30,6 @@ public class MockCommandLineState extends CommandLineState {
     super(env);
   }
 
-  @Nullable
   protected OSProcessHandler startProcess() throws ExecutionException {
     return null;
   }
diff --git a/platform/lang-impl/src/com/intellij/tools/ToolRunProfile.java b/platform/lang-impl/src/com/intellij/tools/ToolRunProfile.java
index 5a22d507c024..65d2508a9bf0 100644
--- a/platform/lang-impl/src/com/intellij/tools/ToolRunProfile.java
+++ b/platform/lang-impl/src/com/intellij/tools/ToolRunProfile.java
@@ -82,6 +82,7 @@ public class ToolRunProfile implements ModuleRunProfile{
         return myCommandLine;
       }
 
+      @NotNull
       protected OSProcessHandler startProcess() throws ExecutionException {
         final GeneralCommandLine commandLine = createCommandLine();
         final OSProcessHandler processHandler = new OSProcessHandler(commandLine.createProcess(), commandLine.getCommandLineString());
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcRunConfiguration.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcRunConfiguration.java
index 598a9ffa8736..8e5c685e012a 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcRunConfiguration.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcRunConfiguration.java
@@ -268,6 +268,7 @@ public abstract class MvcRunConfiguration extends ModuleBasedConfiguration<RunCo
       MvcFramework.addJavaHome(params, myModule);
     }
 
+    @NotNull
     @Override
     protected OSProcessHandler startProcess() throws ExecutionException {
       final OSProcessHandler handler = super.startProcess();
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunConfiguration.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunConfiguration.java
index 4e67df1942cb..84770fa6c2b9 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunConfiguration.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunConfiguration.java
@@ -73,6 +73,7 @@ public class MavenRunConfiguration extends RunConfigurationBase implements Locat
           .createJavaParameters(env.getProject(), mySettings.myRunnerParameters, mySettings.myGeneralSettings, mySettings.myRunnerSettings);
       }
 
+      @NotNull
       @Override
       protected OSProcessHandler startProcess() throws ExecutionException {
         OSProcessHandler result = super.startProcess();
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenServerManager.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenServerManager.java
index adf7e52eaa45..799748c6edd4 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenServerManager.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenServerManager.java
@@ -198,6 +198,7 @@ public class MavenServerManager extends RemoteObjectWrapper<MavenServer> {
         return new DefaultExecutionResult(null, processHandler, AnAction.EMPTY_ARRAY);
       }
 
+      @NotNull
       protected OSProcessHandler startProcess() throws ExecutionException {
         SimpleJavaParameters params = createJavaParameters();
         Sdk sdk = params.getJdk();
diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltCommandLineState.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltCommandLineState.java
index 96b143e258a1..80a418625108 100644
--- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltCommandLineState.java
+++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltCommandLineState.java
@@ -44,6 +44,7 @@ import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.VirtualFileManager;
 import com.intellij.util.net.NetUtils;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import java.io.File;
@@ -69,6 +70,7 @@ class XsltCommandLineState extends CommandLineState {
         myIsDebugger = settings != null && "Debug".equals(settings.getRunnerId());
     }
 
+    @NotNull
     protected OSProcessHandler startProcess() throws ExecutionException {
         final OSProcessHandler osProcessHandler = createJavaParameters().createOSProcessHandler();
         osProcessHandler.putUserData(STATE, this);