v: handle errors better
Merged in master branch