Merge "Fix nullptr dereference."