Merge "Guard aginst another NPE" into rvc-qpr-dev