Add exception types and remove 'Async' instance.