Merge "Fix an obscure NPE" into rvc-dev