Add exception management.