Merge branch 'improve_error_handling' into 'master'

Improve error handling

See merge request !12
1 job for master in 21 minutes and 42 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed Test #8482
ci-test

00:21:42