Improved error messages management.