diff --git a/roster_tweaks/roster_tweaks.py b/roster_tweaks/roster_tweaks.py
index 46c90011c741ffbfa05dc86bea90c0a535837ec9..10fa6abe482e0586333908bf949fdb5e32ff8880 100644
--- a/roster_tweaks/roster_tweaks.py
+++ b/roster_tweaks/roster_tweaks.py
@@ -92,6 +92,8 @@ class RosterTweaksPlugin(GajimPlugin):
             accounts = gajim.connections.keys()
             message = widget.get_text()
             for account in accounts:
+                if not gajim.account_is_connected(account):
+                    continue
                 current_show = gajim.SHOW_LIST[
                     gajim.connections[account].connected]
                 gajim.interface.roster.send_status(account, current_show,
@@ -109,7 +111,8 @@ class RosterTweaksPlugin(GajimPlugin):
             self.draw_activity()
             accounts = gajim.connections.keys()
             for account in accounts:
-                gajim.interface.roster.send_pep(account, self.pep_dict)
+                if gajim.account_is_connected(account):
+                    gajim.interface.roster.send_pep(account, self.pep_dict)
         ChangeActivityDialog(on_response, self.pep_dict.get('activity', None),
             self.pep_dict.get('subactivity', None),
             self.pep_dict.get('activity_text', None))
@@ -121,7 +124,8 @@ class RosterTweaksPlugin(GajimPlugin):
             self.draw_mood()
             accounts = gajim.connections.keys()
             for account in accounts:
-                gajim.interface.roster.send_pep(account, self.pep_dict)
+                if gajim.account_is_connected(account):
+                    gajim.interface.roster.send_pep(account, self.pep_dict)
         ChangeMoodDialog(on_response, self.pep_dict.get('mood', None),
             self.pep_dict.get('mood_text', None))