[CMPV2] Fix NPE & enhance error messages