diff --git a/server/server.py b/server/server.py
index f74759944..d1ad953f1 100644
--- a/server/server.py
+++ b/server/server.py
@@ -447,7 +447,10 @@ def irc_thread():
                     s.send('PONG '+line[1]+'\n')
                 elif '353' in line: # answer to /names
                     k = line.index('353')
-                    k2 = line.index('366')
+                    try:
+                        k2 = line.index('366')
+                    except:
+                        continue
                     for item in line[k+1:k2]:
                         if item[0:2] == 'E_':
                             s.send('USERHOST %s\n'%item)
diff --git a/setup.py b/setup.py
index 864984aaa..937c1db0b 100644
--- a/setup.py
+++ b/setup.py
@@ -26,8 +26,8 @@ if __name__ == '__main__':
         f = open("/var/www/electrum/index.html")
         s = f.read()
         f.close()
-        s = re.sub("Electrum-([\d\.]*?)\.tar\.gz", _tgz, s)
-        s = re.sub("Electrum-([\d\.]*?)\.zip", _zip, s)
+        s = re.sub("Electrum-([\d\.a-z]*?)\.tar\.gz", _tgz, s)
+        s = re.sub("Electrum-([\d\.a-z]*?)\.zip", _zip, s)
         f = open("/var/www/electrum/index.html","w")
         f.write(s)
         f.close()