Merge "Add more consistent null checks" into main