Adding error control