1 files changed, 5 insertions, 1 deletions
diff --git a/src/messages.c b/src/messages.c
index 6f45b06e8..6894cd43d 100644
--- a/src/messages.c
+++ b/src/messages.c
@@ -120,8 +120,12 @@ int m_privmsg(const char *source, const char *receiver, const char *msg)
 
     if (!u) {
         alog("%s: user record for %s not found", msg, source);
-        ircdproto->SendMessage(receiver, source,
+		/* Two lookups naughty, however, this won't happen often. -- w00t */
+		if (findbot(receiver))
+		{
+        	ircdproto->SendMessage(findbot(receiver), source,
                          getstring(NULL, USER_RECORD_NOT_FOUND));
+		}
         return MOD_CONT;
     }