Change instances of Exception to RuntimeException