Improve pac for exceptions