Fix to use single object for shutdown handler tracking