Merge "Stop throwing if the label is null" into sc-dev