Merge "Update span error message to be more descriptive" into main