diff --git a/src/common/contacts.py b/src/common/contacts.py
index 7de187c7e..8a55e0b81 100644
--- a/src/common/contacts.py
+++ b/src/common/contacts.py
@@ -103,7 +103,7 @@ class Contact(CommonContact):
             our_chatstate, chatstate, client_caps=client_caps)
 
         self.contact_name = '' # nick choosen by contact
-        self.groups = [i for i in set(groups)] # filter duplicate values
+        self.groups = [i if i else _('General') for i in set(groups)] # filter duplicate values
 
         self.sub = sub
         self.ask = ask
diff --git a/src/roster_window.py b/src/roster_window.py
index ff5260c3e..eb1d4f935 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -313,7 +313,7 @@ class RosterWindow:
         delimiter = gajim.connections[account].nested_group_delimiter
         group_splited = group.split(delimiter)
         parent_group = delimiter.join(group_splited[:-1])
-        if parent_group in self._iters[account_group]['groups']:
+        if len(group_splited) > 1 and parent_group in self._iters[account_group]['groups']:
             iter_parent = self._iters[account_group]['groups'][parent_group]
         elif parent_group:
             iter_parent = self._add_group_iter(account, parent_group)