WIP on moving to sensible error messages