Better error control.