Merge "Fixing stray NPEs" into rvc-dev