[RJ-Servi] Improve non-null checks
1 file changed