From 1c2f7a3359d1076f1dfa8d46ac4e5c106b5e9d74 Mon Sep 17 00:00:00 2001
From: Dennis Ushakov <dennis.ushakov@gmail.com>
Date: Wed, 2 Nov 2011 14:54:01 +0400
Subject: [PATCH] fix NPE

---
 .../src/com/intellij/openapi/wm/impl/FocusManagerImpl.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/FocusManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/FocusManagerImpl.java
index 30e48f66f225..4f985cfc0fe6 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/FocusManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/FocusManagerImpl.java
@@ -812,7 +812,10 @@ public class FocusManagerImpl extends IdeFocusManager implements Disposable {
 
     Component result = null;
     if (!ApplicationManager.getApplication().isActive()) {
-      result = myLastFocusedAtDeactivation.get(getLastFocusedFrame()).get();
+      final WeakReference<Component> ref = myLastFocusedAtDeactivation.get(getLastFocusedFrame());
+      if (ref != null) {
+        result = ref.get();
+      }
     } else if (myRunContext != null) {
       result = (Component)myRunContext.getData(PlatformDataKeys.CONTEXT_COMPONENT.getName());
     }