Merge "Catch rule creation exceptions." into nyc-dev