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 ref = myLastFocusedAtDeactivation.get(getLastFocusedFrame()); + if (ref != null) { + result = ref.get(); + } } else if (myRunContext != null) { result = (Component)myRunContext.getData(PlatformDataKeys.CONTEXT_COMPONENT.getName()); }