Restore shutdown check ... but in a slightly different spot