[TASK] Throw appropriate exception and add test
Merge pull request #630 from bjo3rnf/vhexception

[TASK] Throw appropriate exception and add test