exceptions fixed