added error messages support