Add missing files from previous commit.
Handler another exception on shutdown.