ref: 6636cf1bea77d20ef2a72a45fae59ac402fb133b
parent: f669ef6bec25155d015b6ab231c53caef4fa5cdc
author: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
date: Tue Oct 23 10:37:09 EDT 2018
Resolve error handling/parser related TODOs See #5324