Updates on error handling logic (#54)

* updates on resolver

* updates on error handling logic

* removed unintended comments

---------

Co-authored-by: Wangdahai <[email protected]>
Co-authored-by: Wangdahai <[email protected]>

Author: 3 people