--- a/src/cm/client.py	Mon May 14 16:24:21 2012 +0200
+++ b/src/cm/client.py	Tue May 15 09:36:18 2012 +0200
@@ -322,9 +322,9 @@
         name['display'] = name['name']
 
     def sort_with_author_or_me_first(x, y):
-      if x.startswith(_(u'me')) or x.startswith(_(u'author')):
+      if x and (x.startswith(_(u'me')) or x.startswith(_(u'author'))):
         return -1
-      if y.startswith(_(u'me')) or y.startswith(_(u'author')):
+      if y and (y.startswith(_(u'me')) or y.startswith(_(u'author'))):
         return 1
       else:
         return cmp(x, y)