Merge change 3702 into donut

* changes:
  Change exceptions to RuntimeException.