Better handling of failing connects