Add error checks, part one