diff --git a/pydle/features/rfc1459/client.py b/pydle/features/rfc1459/client.py
index <HASH>..<HASH> 100644
--- a/pydle/features/rfc1459/client.py
+++ b/pydle/features/rfc1459/client.py
@@ -688,7 +688,7 @@ class RFC1459Support(BasicClient):
 
     def on_raw_318(self, message):
         """ End of /WHOIS list. """
-        target, nickname =  message.params[0]
+        target, nickname =  message.params[:2]
 
         # Mark future as done.
         if nickname in self._requests['whois']:
Parse end of WHOIS list properly.