Follow "error message compatction" change