Avoid NPE on conflict during gerrit checkout