Fix: Add error messages
Merge branch 'master' of github.com:naparuba/shinken