From b194eb876f5f0a8dbc3376f91d29c105cc0f509f Mon Sep 17 00:00:00 2001
From: "Vladislav.Soroka" <Vladislav.Soroka@jetbrains.com>
Date: Wed, 21 Sep 2016 16:21:06 +0300
Subject: [PATCH] es_aware_run_make: fix possible npe if
 ExecutionEnvironmentProvider is absent

---
 .../execution/runners/ExecutionEnvironmentBuilder.java     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/platform/lang-api/src/com/intellij/execution/runners/ExecutionEnvironmentBuilder.java b/platform/lang-api/src/com/intellij/execution/runners/ExecutionEnvironmentBuilder.java
index cefc1637d9f7..1103efdd1984 100644
--- a/platform/lang-api/src/com/intellij/execution/runners/ExecutionEnvironmentBuilder.java
+++ b/platform/lang-api/src/com/intellij/execution/runners/ExecutionEnvironmentBuilder.java
@@ -166,9 +166,12 @@ public final class ExecutionEnvironmentBuilder {
 
   @NotNull
   public ExecutionEnvironment build() {
-    ExecutionEnvironment environment =
-      ServiceManager.getService(myProject, ExecutionEnvironmentProvider.class).createExecutionEnvironment(
+    ExecutionEnvironment environment = null;
+    ExecutionEnvironmentProvider environmentProvider = ServiceManager.getService(myProject, ExecutionEnvironmentProvider.class);
+    if (environmentProvider != null) {
+      environment = environmentProvider.createExecutionEnvironment(
         myProject, myRunProfile, myExecutor, myTarget, myRunnerSettings, myConfigurationSettings, myRunnerAndConfigurationSettings);
+    }
 
     if (environment == null && myRunner == null) {
       if (myRunnerId == null) {