diff --git a/src/roster_window.py b/src/roster_window.py
index 8dcf92e50..eebee371c 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -49,8 +49,10 @@ class RosterWindow:
 
 	def get_account_iter(self, name):
 		if self.regroup:
-			return None
+			return
 		model = self.tree.get_model()
+		if model is None:
+			return
 		account = model.get_iter_root()
 		while account:
 			account_name = model.get_value(account, 3)