Add TODO(mwise) comment regarding catching Exception