Removed redudant error checking