Improvements of error messages (yet again)