diff --git a/clients_icons/clients_icons.py b/clients_icons/clients_icons.py
index 60553cc..5df6a63 100644
--- a/clients_icons/clients_icons.py
+++ b/clients_icons/clients_icons.py
@@ -229,6 +229,8 @@ class ClientsIconsPlugin(GajimPlugin):
 
         # rewrite avatar
         if vcard_table.get_property('n-columns') == 4:
+            if tooltip.avatar_image not in vcard_table.get_children():
+                return
             avatar_widget_idx = vcard_table.get_children().index(
                 tooltip.avatar_image)
             vcard_table.remove(vcard_table.get_children()[avatar_widget_idx])
@@ -297,6 +299,8 @@ class ClientsIconsPlugin(GajimPlugin):
 
         # rewrite avatar
         if vcard_table.get_property('n-columns') == 4:
+            if tooltip.avatar_image not in vcard_table.get_children():
+                return
             avatar_widget_idx = vcard_table.get_children().index(
                 tooltip.avatar_image)
             vcard_table.remove(vcard_table.get_children()[avatar_widget_idx])
diff --git a/clients_icons/manifest.ini b/clients_icons/manifest.ini
index 36e1502..dc59e99 100644
--- a/clients_icons/manifest.ini
+++ b/clients_icons/manifest.ini
@@ -1,7 +1,7 @@
 [info]
 name: Clients icons
 short_name: clients_icons
-version: 4.0
+version: 4.1
 description: Shows the client icons in the roster
  and in groupchats.
  For icons in tooltip support, you need to install Gajim r14117 or above.