Additional error checks