better error reporting
Merge branch 'master' of github.com:russross/sandboxservice