Merge "Fix potential nullptr dereference."