shutdown-fix: fix a possible crasher on shutdown
Merge pull request #160 from pagespeed/oschaaf-shutdown-fix

shutdown-fix: fix a possible crasher on shutdown