some exceptions fixed