Tidy up around VnuBadAttrValueException handling.