krypton-exit-fix.patch

diff --git a/xbmc/guilib/GUIWindowManager.cpp b/xbmc/guilib/GUIWindowManager.cpp
index 2a3b7f1653..34b534dc65 100644
--- a/xbmc/guilib/GUIWindowManager.cpp
+++ b/xbmc/guilib/GUIWindowManager.cpp
@@ -1210,13 +1210,15 @@ void CGUIWindowManager::DeInitialize()
   for (WindowMap::iterator it = m_mapWindows.begin(); it != m_mapWindows.end(); ++it)
   {
     CGUIWindow* pWindow = (*it).second;
-    if (IsWindowActive(it->first, false))
-    {
-      pWindow->DisableAnimations();
-      pWindow->Close(true);
+    if (pWindow) {
+      if (IsWindowActive(it->first, false))
+      {
+        pWindow->DisableAnimations();
+        pWindow->Close(true);
+      }
+      pWindow->ResetControlStates();
+      pWindow->FreeResources(true);
     }
-    pWindow->ResetControlStates();
-    pWindow->FreeResources(true);
   }
   UnloadNotOnDemandWindows();