Merge "Protect against NullPointerException" into rvc-dev