some fixes above exceptions