Merge "Fix a stupid NPE" into rvc-dev