This PR was focused solely on the manual parsing, so I had no need to change the current error handling. Thanks for merging it.