diff --git a/platform/platform-api/src/com/intellij/execution/configurations/ParametersList.java b/platform/platform-api/src/com/intellij/execution/configurations/ParametersList.java
index 56c4f6959997..762ba6c55400 100644
--- a/platform/platform-api/src/com/intellij/execution/configurations/ParametersList.java
+++ b/platform/platform-api/src/com/intellij/execution/configurations/ParametersList.java
@@ -335,7 +335,10 @@ public class ParametersList implements Cloneable {
       if (application != null) {
         final PathMacros pathMacros = PathMacros.getInstance();
         for (String name : pathMacros.getUserMacroNames()) {
-          myMacroMap.put("${" + name + "}", pathMacros.getValue(name));
+          final String value = pathMacros.getValue(name);
+          if (value != null) {
+            myMacroMap.put("${" + name + "}", value);
+          }
         }
         final Map<String, String> env = EnvironmentUtil.getEnviromentProperties();
         for (String name : env.keySet()) {