diff --git a/api/humbug/__init__.py b/api/humbug/__init__.py
index e2a6a8a4c3..e4da8ad88c 100644
--- a/api/humbug/__init__.py
+++ b/api/humbug/__init__.py
@@ -203,10 +203,20 @@ class Client(object):
         call.func_name = name
         setattr(cls, name, call)
 
-    def call_on_each_message(self, callback, options = {}):
+    def call_on_each_event(self, callback, event_types=None):
         def do_register():
-            res = self.register(event_types=['message'])
-            return (res['queue_id'], res['last_event_id'])
+            while True:
+                if event_types is None:
+                    res = self.register()
+                else:
+                    res = self.register(event_types=event_types)
+
+                if 'error' in res.get('result'):
+                    if self.verbose:
+                        print "Server returned error:\n%s" % res['msg']
+                    time.sleep(1)
+                else:
+                    return (res['queue_id'], res['last_event_id'])
 
         queue_id = None
         while True:
@@ -217,10 +227,10 @@ class Client(object):
             if 'error' in res.get('result'):
                 if res["result"] == "http-error":
                     if self.verbose:
-                        print "HTTP error fetching messages -- probably a server restart"
+                        print "HTTP error fetching events -- probably a server restart"
                 elif res["result"] == "connection-error":
                     if self.verbose:
-                        print "Connection error fetching messages -- probably server is temporarily down?"
+                        print "Connection error fetching events -- probably server is temporarily down?"
                 else:
                     if self.verbose:
                         print "Server returned error:\n%s" % res["msg"]
@@ -228,7 +238,7 @@ class Client(object):
                         # Our event queue went away, probably because
                         # we were asleep or the server restarted
                         # abnormally.  We may have missed some
-                        # messages while the network was down or
+                        # events while the network was down or
                         # something, but there's not really anything
                         # we can do about it other than resuming
                         # getting new ones.
@@ -239,15 +249,16 @@ class Client(object):
                 time.sleep(1)
                 continue
 
-            messages = []
             for event in res['events']:
                 last_event_id = max(last_event_id, int(event['id']))
-                if event['type'] == 'message':
-                    messages.append(event['message'])
+                callback(event)
 
-            # The messages should already be sorted, but we sort just in case
-            for message in sorted(messages, key=lambda x: int(x["id"])):
-                callback(message)
+    def call_on_each_message(self, callback):
+        def event_callback(event):
+            if event['type'] == 'message':
+                callback(event['message'])
+
+        self.call_on_each_event(event_callback, ['message'])
 
 def _mk_subs(streams):
     return {'subscriptions': streams}
@@ -255,10 +266,15 @@ def _mk_subs(streams):
 def _mk_del_subs(streams):
     return {'delete': streams}
 
+def _mk_events(event_types=None):
+    if event_types is None:
+        return dict()
+    return dict(event_types=event_types)
+
 Client._register('send_message', url='messages', make_request=(lambda request: request))
 Client._register('get_messages', method='GET', url='messages/latest', longpolling=True)
 Client._register('get_events', url='events', method='GET', longpolling=True, make_request=(lambda **kwargs: kwargs))
-Client._register('register', make_request=(lambda event_types=[]: dict(event_types=event_types)))
+Client._register('register', make_request=_mk_events)
 Client._register('get_profile', method='GET', url='users/me')
 Client._register('get_public_streams', method='GET', url='streams')
 Client._register('get_members', method='GET', url='users')