Review: Fix DNS errors when connection fails