Merge "Tweak VVM error handling" into nyc-mr1-dev