diff --git a/discord/__init__.py b/discord/__init__.py
index 28bdc5619..3f916801d 100644
--- a/discord/__init__.py
+++ b/discord/__init__.py
@@ -15,8 +15,8 @@ __title__ = 'discord'
 __author__ = 'Rapptz'
 __license__ = 'MIT'
 __copyright__ = 'Copyright 2015 Rapptz'
-__version__ = '0.5.0'
-__build__ = 0x005000
+__version__ = '0.5.1'
+__build__ = 0x005010
 
 from .client import Client
 from .user import User
diff --git a/discord/client.py b/discord/client.py
index 6934d943a..331bf56fd 100644
--- a/discord/client.py
+++ b/discord/client.py
@@ -107,7 +107,7 @@ class Client(object):
             'on_channel_create': _null_event,
             'on_member_join': _null_event,
             'on_member_remove': _null_event,
-            'on_member_join': _null_event,
+            'on_member_update': _null_event,
             'on_server_create': _null_event,
             'on_server_delete': _null_event,
         }
@@ -197,7 +197,7 @@ class Client(object):
         try:
             self.events[event_name](*args, **kwargs)
         except Exception as e:
-            self.events['error'](event_name, *sys.exc_info())
+            self.events['on_error'](event_name, *sys.exc_info())
 
 
     def _received_message(self, msg):