Thanks Hermann. My "HALT, HALT" code was not intended as a very robust solution to prevent code execution. Will definitely add an IF wrapper around these points.
I'm still a bit unclear whether the new point data would be saved in the correct cartesian position when updating with a new tool, but I can continue testing to see if it does or not.