Fix test failure

Caused by a change breaking a new test that had been sitting in a PR.
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
Fix: yaml parse result could be an invalid structure
Add a test case for empty config file
Renaming
Merge remote-tracking branch 'upstream/master' into empty-config