fixed error messages issue