Updates on error handling logic (#54)

* updates on resolver

* updates on error handling logic

* removed unintended comments

---------

Co-authored-by: Wangdahai <wangdahai@WangdahaideMacBook-Air.local>
Co-authored-by: Wangdahai <wangdahai@192.168.1.24>

Author: 3 people