Add exception handling to a few handlers