exception types adjusted