Fix NPE with /hg join