Sorry, I meant to say "I think a throw would be good here". Arguably, it should be added to disconnect as well, but that would be a breaking change. I wouldn't mind seeing it there though. If we do that, that probably should be separate patch. What do you think?