Fix that crash thing
Merge pull request #304 from mozilla/ensure-exit-on-error

Fix that crash thing