Increased robustness of parsing.

This was in response to an error detected on honeybadger.