CLC-3072 Return more user-friendly errors when CFV gives us problems
Merge pull request #1988 from ctweney/clc-3072

CLC-3072 Return more user-friendly errors when CFV gives us problems