Watson has made a new release ☺
Rewrite error handlers to use same context as the rest of the site

Fixes #31