Added support for error messages