Improve Error handling

[Asone]

As we implement more logic with help of third-parties, more errors are prone to be triggered which can be very different in the way they should be handled.

A thought should be given on handling the different kind of errors with more clarity