diff --git a/src/ircdb.py b/src/ircdb.py
index 2af5de710..d5462038c 100644
--- a/src/ircdb.py
+++ b/src/ircdb.py
@@ -484,7 +484,7 @@ def checkCapabilities(hostmask, capabilities, requireAll=False):
         return False
 
 def getUser(irc, s):
-    if ircutils.isHostmask(s):
+    if ircutils.isUserHostmask(s):
         return users.getUserName(s)
     else:
         if users.hasUser(s):
diff --git a/src/irclib.py b/src/irclib.py
index 22153ec0d..1a16cc9ea 100644
--- a/src/irclib.py
+++ b/src/irclib.py
@@ -319,7 +319,7 @@ class Irc(object):
                 #debug.printf(repr(msg))
                 msg = callback.outFilter(self, msg)
                 if msg is None:
-                    s = 'outFilter %s returned None' % callbacks.name()
+                    s = 'outFilter %s returned None' % callback.name()
                     debug.debugMsg(s)
                     return None
             self.state.addMsg(self,ircmsgs.IrcMsg(msg=msg, prefix=self.prefix))