Don't check for connection errors right away.

And don't bother checking from a list of esotheric error codes.
Depend on the status check that comes later.
Merge branch '1.4-stable'