refactor error handling

Issue-ID: VNFSDK-350
Change-Id: I1486907e291539e3e59c5be03cc0955159613f84
Signed-off-by: Moshe <moshehoa@amdocs.com>
2 files changed