Add better exception handling during parse, and improved a few inconsistencies.