improved-error-handling
Merge branch 'master' of https://github.com/firepick1/FireSight