--- a/mercurial/revset.py	Sun Aug 09 16:06:36 2015 +0900
+++ b/mercurial/revset.py	Sun Aug 09 16:09:41 2015 +0900
@@ -2280,7 +2280,7 @@
             del ss[:]
         for y in x[1:]:
             w, t = optimize(y, False)
-            if t[0] == 'string' or t[0] == 'symbol':
+            if t is not None and (t[0] == 'string' or t[0] == 'symbol'):
                 ss.append((w, t))
                 continue
             flushss()