Merge "Do not crash if label is null." into nyc-dev