added june 03 feat. correct exceptions