Better handle restarting a previously aborted build by adding a protective