diff --git a/project.py b/project.py
index df1e2647..d9591c40 100644
--- a/project.py
+++ b/project.py
@@ -920,8 +920,11 @@ class Project(object):
         if out:
           out = iter(out[:-1].split('\0'))
           while out:
-            info = out.next()
-            path = out.next()
+            try:
+              info = out.next()
+              path = out.next()
+            except StopIteration:
+              break
 
             class _Info(object):
               def __init__(self, path, omode, nmode, oid, nid, state):