Merge pull request #286 from d0ugal/master

Fix test failure
Catch errors in the Watchdog error handler

Fixes #164
Merge pull request #289 from d0ugal/error-handling

Catch errors in the Watchdog error handler
Remove references to non-existant theme ghostwriter