fix unexpected shutdown exception during regular shutdown

2 jobs for master in 2 minutes and 12 seconds (queued for 8 seconds)