Better error handling for CPP-validation.