diff -uNr Unreal3.2.orig/src/modules/m_whois.c Unreal3.2/src/modules/m_whois.c
--- Unreal3.2.orig/src/modules/m_whois.c	2006-12-22 22:10:34.000000000 +0100
+++ Unreal3.2/src/modules/m_whois.c	2007-04-19 09:37:38.000000000 +0200
@@ -334,8 +334,9 @@
 		if (!found)
 			sendto_one(sptr, err_str(ERR_NOSUCHNICK),
 			    me.name, parv[0], nick);
+		else
+			sendto_one(sptr, rpl_str(RPL_ENDOFWHOIS), me.name, parv[0], nick);
 	}
-	sendto_one(sptr, rpl_str(RPL_ENDOFWHOIS), me.name, parv[0], querybuf);
 
 	return 0;
 }