added missing exceptions