deal with job destruction and failure a bit better