Last changes for error messages.