Try/catch around cleanup.
Merge branch 'master' of github.com:mapbox/tm2