diff --git a/src/core/xmpp.py b/src/core/xmpp.py
index 4f058602..692331fe 100644
--- a/src/core/xmpp.py
+++ b/src/core/xmpp.py
@@ -165,6 +165,9 @@ class SatPresenceProtocol(xmppim.PresenceClientProtocol):
     def availableReceived(self, entity, show=None, statuses=None, priority=0):
         debug (_("presence update for [%(entity)s] (available, show=%(show)s statuses=%(statuses)s priority=%(priority)d)") % {'entity':entity, 'show':show, 'statuses':statuses, 'priority':priority})
         
+        if not statuses:
+            statuses = {}
+        
         if statuses.has_key(None):   #we only want string keys
             statuses["default"] = statuses[None]
             del statuses[None]
@@ -178,8 +181,10 @@ class SatPresenceProtocol(xmppim.PresenceClientProtocol):
     
     def unavailableReceived(self, entity, statuses=None):
         debug (_("presence update for [%(entity)s] (unavailable, statuses=%(statuses)s)") % {'entity':entity, 'statuses':statuses})
+        
         if not statuses:
             statuses = {}
+        
         if statuses.has_key(None):   #we only want string keys
             statuses["default"] = statuses[None]
             del statuses[None]