diff --git a/adafruit_minimqtt/adafruit_minimqtt.py b/adafruit_minimqtt/adafruit_minimqtt.py
index 7ede9559..622c6e68 100644
--- a/adafruit_minimqtt/adafruit_minimqtt.py
+++ b/adafruit_minimqtt/adafruit_minimqtt.py
@@ -424,7 +424,7 @@ def connect(
                 )
                 self._reset_reconnect_backoff()
                 return ret
-            except RuntimeError as e:
+            except (MemoryError, OSError, RuntimeError) as e:
                 self.logger.warning(f"Socket error when connecting: {e}")
                 backoff = False
             except MMQTTException as e:
diff --git a/tests/test_port_ssl.py b/tests/test_port_ssl.py
index 9ac154da..2aa877f5 100644
--- a/tests/test_port_ssl.py
+++ b/tests/test_port_ssl.py
@@ -120,6 +120,6 @@ def test_tls_without_ssl_context(self) -> None:
             connect_retries=1,
         )
 
-        with pytest.raises(AttributeError) as context:
+        with pytest.raises(ValueError) as context:
             mqtt_client.connect()
-        assert "ssl_context must be set" in str(context)
+        assert "ssl_context must be provided if using ssl" in str(context)