[VEG-bau] Improve error handling

[anushkafka]

Description

Was going through the code with regards to the issue discussed here and noticed that we should also return after the reject() to stop further execution, otherwise resolve() might still be called.

2939523 Improve error handling

7e1b980 Improve code by integrating the reject in the return

35fda3f Update the timeout settings

Detail

Checklist

• [ ] :guardsman: includes new unit and functional tests