Merge "Add missing null check"