rebuild exception handlings system; clean up