fix exception types