Since commit 57aeabcc, it handles errors on the control connection while waiting for the data connection better. Test 591 and 592 are updated accordingly.