Make sure jobs end up in a good state when they exit on their own