Merge "Fix another nullptr dereference."