WIP on the error handling