Adds more error control