Merge "Add null test and remove redundant call."