From f39dcca32eb548ccd1584336bc3e85c1b1b13f0e Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Wed, 24 Apr 2013 22:19:08 +0200
Subject: [PATCH] Stupid NPE fixed

---
 .../src/com/intellij/openapi/projectRoots/JdkUtil.java        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/platform/lang-api/src/com/intellij/openapi/projectRoots/JdkUtil.java b/platform/lang-api/src/com/intellij/openapi/projectRoots/JdkUtil.java
index 6eaa636943be..15279968ff0d 100644
--- a/platform/lang-api/src/com/intellij/openapi/projectRoots/JdkUtil.java
+++ b/platform/lang-api/src/com/intellij/openapi/projectRoots/JdkUtil.java
@@ -164,7 +164,9 @@ public class JdkUtil {
     commandLine.setExePath(exePath);
 
     final ParametersList vmParametersList = javaParameters.getVMParametersList();
-    commandLine.getEnvironment().putAll(javaParameters.getEnv());
+    if (javaParameters.getEnv() != null) {
+      commandLine.getEnvironment().putAll(javaParameters.getEnv());
+    }
     commandLine.setPassParentEnvironment(javaParameters.isPassParentEnvs());
 
     final Class commandLineWrapper;