Fix RVP to prevent NPEs.