Merge branch 'wip_error-handling' into 'master'

Tweak error handling

Tweak how exceptions are captured by the catch blocks

See merge request !21
1 job for master in 23 seconds (queued for 5 seconds)