diff --git a/coremods/service_support.py b/coremods/service_support.py
index c10e0d3..1d26a6e 100644
--- a/coremods/service_support.py
+++ b/coremods/service_support.py
@@ -51,6 +51,7 @@ def spawn_service(irc, source, command, args):
     # Special case: if this is the main PyLink client being spawned,
     # assign this as irc.pseudoclient.
     if name == 'pylink':
+        log.debug('(%s) irc.pseudoclient set to UID %s', irc.name, u)
         irc.pseudoclient = userobj
 
     # TODO: channels should be tracked in a central database, not hardcoded
diff --git a/protocols/clientbot.py b/protocols/clientbot.py
index 18f65fd..eb30ecd 100644
--- a/protocols/clientbot.py
+++ b/protocols/clientbot.py
@@ -308,7 +308,7 @@ class ClientbotWrapperProtocol(Protocol):
                 nick, ident, host = utils.splitHostmask(sender)
                 idsource = self.irc.nickToUid(nick)
 
-                if not idsource:
+                if (not idsource) and self.irc.pseudoclient:
                     # We don't know the sender, so it most be new.
                     idsource = self.spawnClient(nick, ident, host, server=self.irc.uplink).uid