X-Git-Url: https://plomlompom.com/repos/?p=plomlombot-irc.git;a=blobdiff_plain;f=plomlombot.py;h=80def0db6990eba4dd76fd180529e648cf8c3883;hp=35d3c2fbded5a454f974df98ac24dcec362a8ed0;hb=53c90d5436ff2a60a6b689fddc9e5e79e0dd7b25;hpb=406dc83c2b15e8ca0a58b244dc7eaeee42d2bbb4

diff --git a/plomlombot.py b/plomlombot.py
index 35d3c2f..80def0d 100755
--- a/plomlombot.py
+++ b/plomlombot.py
@@ -118,7 +118,10 @@ class IO:
         self.line_buffer = []
         self.rune_buffer = ""
         self.last_pong = time.time()
-        self.servername = self.recv_line(send_ping=False).split(" ")[0][1:]
+        line = self.recv_line(send_ping=False)
+        if not line or len(line) < 1:
+            raise ExceptionForRestart
+        self.servername = line.split(" ")[0][1:]
 
     def _pingtest(self, send_ping=True):
         if self.last_pong + self.timeout < time.time():
@@ -488,7 +491,7 @@ class Session:
                         notice("maximum number of urls to parse per message "
                                "reached")
                         break
-            if "!" == msg[0]:
+            if "!" == msg[0] and len(msg) > 1:
                 tokens = msg[1:].split()
                 argument = str.join(" ", tokens[1:])
                 handle_command(tokens[0], argument, notice, target, self)