Merge "Add protective null check" into main