Fix bugs with response && error messages