exceptions fix