WORDS-52

WORDS-52 todo: remove 'throws Exception everywhere where not necessary'