Fix crash on exit

1 job for master in 22 minutes and 24 seconds (queued for 8 minutes and 48 seconds)