I thought we got rid of CV_ERROR and CV_FUNCNAME as it was in older syntax? Anyways, I will make the changes.