BUG-731: do not declare Exception as thrown

In one place it's completely unneeded, on the other one we can refactor.

Change-Id: I6d84424c02430c33a964013c11e7130cd2f4ec0f
Signed-off-by: Robert Varga <rovarga@cisco.com>