some exceptions added