BUG-731: rework catch clausule

This eliminates warning about rethrowing exceptions.

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