Return real errors and test for them. Fixes #2
Merge branch 'master' of github.com:mapbox/makizushi