Better handling of re-running an error state job