Merge "Fix invalid access on nullptr" into main