Feat/error handling

No.