Ensure all exceptions are caught
Added testing
Merge branch 'master' of github.com:guyirvine/ServiceMonitor
Changed description