another exceptions fix