Better exception management
Merge branch 'UIV2' of github.com:capensis/canopsis into UIV2