Fix temporary for exceptions >= 0.6