removing redudant error checks