Merge "Guard against IllegalArgumentException" into nyc-dev