Merge "Avoid fatal when finding no base revision for a null revision."