From eb30ad07bdf7fe47a1873ea126b6f9020286da2c Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Sat, 12 Dec 2015 13:52:18 +0100
Subject: [PATCH] don't traceback when deleting an account. Fixes #8199

---
 src/roster_window.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/roster_window.py b/src/roster_window.py
index e60666078..72b758fd6 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -115,6 +115,8 @@ class RosterWindow:
 
         if self.regroup:
             name = 'MERGED'
+        if name not in self._iters:
+            return None
         it = self._iters[name]['account']
 
         if model == self.model or it is None:
@@ -145,6 +147,8 @@ class RosterWindow:
         if self.regroup:
             account = 'MERGED'
 
+        if account not in self._iters:
+            return None
         if name not in self._iters[account]['groups']:
             return None