Changes for exceptions-0.4.