diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.java
index 14366fc46aa7..a846fd4fe87d 100644
--- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.java
+++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.java
@@ -760,7 +760,7 @@ public final class UpdateChecker {
     String toBuildNumber = newVersion.getNumber().asStringWithoutProductCode();
     String jdkMacRedist = System.getProperty("idea.java.redist");
     String bundledJdk = "";
-    if (jdkMacRedist.lastIndexOf("jdk-bundled") >= 0 ){
+    if (jdkMacRedist != null && jdkMacRedist.lastIndexOf("jdk-bundled") >= 0 ){
       bundledJdk = "jdk-bundled".equals(jdkMacRedist) ? "-jdk-bundled" : "-custom-jdk-bundled";
     }