null checks for fixing failing test cases in RD