Fix error messages harder