some enhancements to error handling, plus some comment tidy up, in prep for jisc monitor dev
Merge branch 'jiscmonitor' into dev

Get Richard's recent refactoring in.
remove unused import for a module that does not exist, breaking bug for part of app
Merge branch 'dev'