diff --git a/src/lib/ares__readaddrinfo.c b/src/lib/ares__readaddrinfo.c
index 2315df94..f0b3dcf1 100644
--- a/src/lib/ares__readaddrinfo.c
+++ b/src/lib/ares__readaddrinfo.c
@@ -197,10 +197,6 @@ int ares__readaddrinfo(FILE *fp,
             }
         }
 
-      if (status != ARES_SUCCESS)
-        /* Ignore line if invalid address string for the requested family. */
-        continue;
-
       if (want_cname)
         {
           for (i = 0; i < alias_count; ++i)
diff --git a/src/lib/ares_getaddrinfo.c b/src/lib/ares_getaddrinfo.c
index cb494242..7ba8e91a 100644
--- a/src/lib/ares_getaddrinfo.c
+++ b/src/lib/ares_getaddrinfo.c
@@ -825,7 +825,7 @@ static int as_is_first(const struct host_query* hquery)
   char* p;
   int ndots = 0;
   size_t nname = hquery->name?strlen(hquery->name):0;
-  for (p = hquery->name; *p; p++)
+  for (p = hquery->name; p && *p; p++)
     {
       if (*p == '.')
         {
diff --git a/src/lib/ares_parse_uri_reply.c b/src/lib/ares_parse_uri_reply.c
index d79b5c4d..bb282675 100644
--- a/src/lib/ares_parse_uri_reply.c
+++ b/src/lib/ares_parse_uri_reply.c
@@ -151,9 +151,6 @@ ares_parse_uri_reply (const unsigned char *abuf, int alen,
           uri_curr->uri = strncpy(uri_curr->uri, (const char *)vptr, rr_len-4);
           uri_curr->uri[rr_len-4]='\0';
           uri_curr->ttl = rr_ttl;
-
-          if (status != ARES_SUCCESS)
-            break;
         }
 
       /* Don't lose memory in the next iteration */