Make sure we're checking whether tearing down is due after finishing a job
Reviewed by David Edmundson