Merge "Add null check for NPE before logging" into rvc-dev