fix for null timer on shutdown