From 5046a58f4e95270383c40d42be2401be658e41a4 Mon Sep 17 00:00:00 2001
From: "Maxim.Mossienko" <Maxim.Mossienko@jetbrains.com>
Date: Thu, 10 Dec 2015 17:41:43 +0100
Subject: [PATCH] IDEA-149135 Start failed when using JDK6 as IDEA_JDK

---
 platform/platform-impl/src/com/intellij/ui/Splash.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/platform/platform-impl/src/com/intellij/ui/Splash.java b/platform/platform-impl/src/com/intellij/ui/Splash.java
index 08904eb6da33..2a74da81021f 100644
--- a/platform/platform-impl/src/com/intellij/ui/Splash.java
+++ b/platform/platform-impl/src/com/intellij/ui/Splash.java
@@ -16,6 +16,7 @@
 package com.intellij.ui;
 
 import com.intellij.ide.StartupProgress;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.ex.ApplicationInfoEx;
 import com.intellij.openapi.application.impl.ApplicationInfoImpl;
 import com.intellij.openapi.util.IconLoader;
@@ -181,7 +182,7 @@ public class Splash extends JDialog implements StartupProgress {
         int offsetX = uiScale(15);
         int offsetY = 30;
         if (Registry.is("ide.new.about")) {
-          ApplicationInfoEx infoEx = ApplicationInfoEx.getInstanceEx();
+          ApplicationInfoEx infoEx = ApplicationManager.getApplication() != null ? ApplicationInfoEx.getInstanceEx() : null;
           if (infoEx instanceof ApplicationInfoImpl) {
             offsetX = Math.max(offsetX, ((ApplicationInfoImpl)infoEx).getProgressX());
             offsetY = ((ApplicationInfoImpl)infoEx).getLicenseOffsetY();