Fix exception/failure handling.