Change an error message (bis)
Minor cleaning