--- a/server/hook.py	Tue Jan 04 14:11:54 2011 +0100
+++ b/server/hook.py	Wed Jan 05 17:50:21 2011 +0100
@@ -307,9 +307,10 @@
 
     def call_hooks(self, event, session=None, **kwargs):
         try:
-            self.vreg['%s_hooks' % event].call_hooks(event, session, **kwargs)
+            registry = self.vreg['%s_hooks' % event]
         except RegistryNotFound:
-            pass # no hooks for this event
+            return # no hooks for this event
+        registry.call_hooks(event, session, **kwargs)
 
 
 for event in ALL_HOOKS:
@@ -354,6 +355,7 @@
         self.expected = expected
         self.frometypes = more.pop('frometypes', None)
         self.toetypes = more.pop('toetypes', None)
+        assert not more, "unexpected kwargs in match_rtype: %s" % more
 
     @lltrace
     def __call__(self, cls, req, *args, **kwargs):