Clients should be able to catch unhandled exceptions and return an error
Merge branch 'master' of github.com:savagematt/toshtogo