Improved error handling to prevent service crashing. Fixes #38 and #29.
Merge pull request #44 from JonnyHeavey/master

Improved error handling to prevent service crashing. Fixes #38 and #29.