gistfile1.txt

diff --git a/wee_slack.py b/wee_slack.py
index a88c9b3..b55dc7f 100644
--- a/wee_slack.py
+++ b/wee_slack.py
@@ -297,7 +297,7 @@ class SlackServer(object):
     def create_slack_mappings(self, data):
 
         for item in data["users"]:
-            self.users.append(User(self, item["name"], item["id"], item["presence"]))
+            self.users.append(User(self, item["name"], item["id"], item["presence"], item["deleted"]))
 
         for item in data["channels"]:
             if "last_read" not in item:
@@ -418,18 +418,21 @@ class Channel(SlackThing):
             self.channel_buffer = None
 
     def update_nicklist(self):
+#        dbg("Update nicklist: {}".format(self.members))
         if self.channel_buffer:
             w.buffer_set(self.channel_buffer, "nicklist", "1")
             w.nicklist_remove_all(self.channel_buffer)
             try:
                 for user in self.members:
                     user = self.server.users.find(user)
+                    if user.deleted:
+                        continue
                     if user.presence == 'away':
                         w.nicklist_add_nick(self.channel_buffer, "", user.name, user.color_name, " ", "", 1)
                     else:
                         w.nicklist_add_nick(self.channel_buffer, "", user.name, user.color_name, "+", "", 1)
-            except:
-                print "DEBUG: {} {}".format(self.identifier,self.name)
+            except Exception as e:
+                print "DEBUG: {} {} {}".format(self.identifier, self.name, e)
 
     def fullname(self):
         return "{}.{}".format(self.server.domain, self.name)
@@ -666,9 +669,10 @@ class DmChannel(Channel):
 
 class User(SlackThing):
 
-    def __init__(self, server, name, identifier, presence="away"):
+    def __init__(self, server, name, identifier, presence="away", deleted=False):
         super(User, self).__init__(name, identifier)
         self.channel_buffer = w.info_get("irc_buffer", "{}.{}".format(domain, self.name))
+        self.deleted = deleted
         self.presence = presence
         self.server = server
         self.update_color()