Debug: safer around fatal exits
Merge branch 'master' of github.com:artfulrobot/artfulrobot