Handle missing revisions a bit better

Change-Id: I0f23833cc19fd377aa173808c4fe4658f3d6ad80
Merge "Handle missing revisions a bit better"