diff -r e34106fa0dc3 -r cfb6682961b8 mercurial/keepalive.py
--- a/mercurial/keepalive.py	Sat May 12 16:00:58 2012 +0200
+++ b/mercurial/keepalive.py	Sat May 12 16:02:45 2012 +0200
@@ -758,7 +758,7 @@
     try:
         N = int(sys.argv[1])
         url = sys.argv[2]
-    except:
+    except (IndexError, ValueError):
         print "%s <integer> <url>" % sys.argv[0]
     else:
         test(url, N)