Implemented more errors
Merge branch 'master' of github.com:jsimplicio/gerbil