ADEN-1027 Remove throws Exception