Bug fixes for NPE when playing RLV