Merge "Fix potential NPE" into rvc-dev