diff --git a/plugins/ChannelDB.py b/plugins/ChannelDB.py
index 4bbe4de51..c80b60dcb 100644
--- a/plugins/ChannelDB.py
+++ b/plugins/ChannelDB.py
@@ -402,6 +402,7 @@ class ChannelDB(plugins.ChannelDBHandler,
                     name = ircdb.users.getUserId(hostmask)
                 except KeyError:
                     irc.errorNoUser()
+                    return
         else:
             table = 'nick_seen'
             criterion = 'normalized=%s'