From c249541e097d28dc87adffac78470ba0fc4be55d Mon Sep 17 00:00:00 2001
From: Kirill Kalishev <kirill.kalishev@jetbrains.com>
Date: Thu, 18 Nov 2010 14:31:26 +0300
Subject: [PATCH] NPE in focus trackback

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

diff --git a/platform/platform-impl/src/com/intellij/ui/FocusTrackback.java b/platform/platform-impl/src/com/intellij/ui/FocusTrackback.java
index 228c6b266d45..07021bc996ff 100644
--- a/platform/platform-impl/src/com/intellij/ui/FocusTrackback.java
+++ b/platform/platform-impl/src/com/intellij/ui/FocusTrackback.java
@@ -429,7 +429,7 @@ public class FocusTrackback {
 
       if (eachTrackback.getRequestor() instanceof AbstractPopup) {
         FocusTrackback newTrackback = ((AbstractPopup)eachTrackback.getRequestor()).getFocusTrackback();
-        if (eachTrackback == newTrackback) break;
+        if (newTrackback == null || eachTrackback == newTrackback) break;
         if (eachTrackback == null || eachTrackback.isConsumed()) break;
 
         eachTrackback  = newTrackback;