I have also added a few
more checks to try and detect similar issues in the future where the
tool accidentally makes a null edit.