added some missing error checks