Merge "Don't crash on invalid numbers." into nyc-dev