Remove redundant error checking