get rid of throw clause