Merge "Fix null pointer handling in ag/25316441" into main