Some more checking, disconnect wasnt properly being set due to closed not being sent in time