Put failure handling : wip