- WIP #5 Improve error reporting