Merge "Fix possible NPE" into rvc-dev