Merge "Fix a theoretical NPE" into rvc-dev