[RFR] Add erorrs handling

Fixes #163 & #77
Same as above: please use this