Fixed NPE for RVP.