Fixed exception handling

  * It need for handling exception in case when exception catched.
  It is wrong return empty dictionary if exception catched.

Change-Id: I76d71cae5ada0384cbc44c8d4e6cc537c04f8f96
Related-PROD: PROD-29484
(cherry picked from commit daaa1ae32ea4ae92410d4adfffb518ff66a34fef)
3 files changed