Better error control