fixed remaining exceptions