Small improvement to error messages