Catch throwables not exceptions - always have to return something
Merge branch 'master' of github.com:savagematt/toshtogo