Merge branch 'vg-exception-handling' into 'master'

Handle that one vg exception

See merge request !44
3 jobs for master in 42 seconds (queued for 5 seconds)