[WIP] Add erorrs handling

Fixes #163 & #77