improve supported exception types