Now we don't crash on shutdown\!