This is not right we should treat that same way that we treat the disconnection, I think it will be easier to proceed with that change after we merge my error handling branch. My proposition is to rebase it on top of it as soon as error handling is merged.