Close a TODO about better error messaging