Merge "Improve error logging for parsing failures" into nyc-dev