Merge "Add a missing null check."