diff --git a/usr.sbin/traceroute/as.c b/usr.sbin/traceroute/as.c
index 7fb952ed3da1..512f1dd6f14c 100644
--- a/usr.sbin/traceroute/as.c
+++ b/usr.sbin/traceroute/as.c
@@ -118,7 +118,7 @@ as_setup(const char *server)
 }
 
 unsigned int
-as_lookup(void *_asn, char *addr, sa_family_t family)
+as_lookup(void *_asn, char *addr, sa_family_t family, int *status)
 {
 	struct aslookup *asn = _asn;
 	char buf[1024];
@@ -128,8 +128,17 @@ as_lookup(void *_asn, char *addr, sa_family_t family)
 	as = 0;
 	rc = dlen = 0;
 	plen = (family == AF_INET6) ? 128 : 32;
-	(void)fprintf(asn->as_f, "!r%s/%d,l\n", addr, plen);
-	(void)fflush(asn->as_f);
+	*status = fprintf(asn->as_f, "!r%s/%d,l\n", addr, plen);
+	if (*status < 0) {
+		*status = errno;
+		return 0;
+	}
+	*status = fflush(asn->as_f);
+	if (*status == EOF) {
+		*status = errno;
+		return 0;
+	}
+	*status = 0;
 
 #ifdef AS_DEBUG_FILE
 	if (asn->as_debug) {
@@ -138,7 +147,14 @@ as_lookup(void *_asn, char *addr, sa_family_t family)
 	}
 #endif /* AS_DEBUG_FILE */
 
-	while (fgets(buf, sizeof(buf), asn->as_f) != NULL) {
+	while (1) {
+		if (fgets(buf, sizeof(buf), asn->as_f) == NULL) {
+			if(feof(asn->as_f) || ferror(asn->as_f)) {
+				*status = EIO;
+				return 0;
+			}
+			break;
+		}
 		buf[sizeof(buf) - 1] = '\0';
 
 #ifdef AS_DEBUG_FILE
diff --git a/usr.sbin/traceroute/as.h b/usr.sbin/traceroute/as.h
index f5a5dae2acec..ac61bbab4786 100644
--- a/usr.sbin/traceroute/as.h
+++ b/usr.sbin/traceroute/as.h
@@ -30,5 +30,5 @@
  */
 
 void *as_setup(const char *);
-unsigned int as_lookup(void *, char *, sa_family_t);
+unsigned int as_lookup(void *, char *, sa_family_t, int *);
 void as_shutdown(void *);
diff --git a/usr.sbin/traceroute/traceroute.c b/usr.sbin/traceroute/traceroute.c
index 1297d3402ebd..be14c40b8d7b 100644
--- a/usr.sbin/traceroute/traceroute.c
+++ b/usr.sbin/traceroute/traceroute.c
@@ -1653,6 +1653,7 @@ print(register u_char *buf, register int cc, register struct sockaddr_in *from)
 {
 	register struct ip *ip;
 	register int hlen;
+	int as, status;
 	char addr[INET_ADDRSTRLEN];
 
 	ip = (struct ip *) buf;
@@ -1661,8 +1662,24 @@ print(register u_char *buf, register int cc, register struct sockaddr_in *from)
 
 	strlcpy(addr, inet_ntoa(from->sin_addr), sizeof(addr));
 
-	if (as_path)
-		Printf(" [AS%u]", as_lookup(asn, addr, AF_INET));
+	while(as_path) {
+		as = as_lookup(asn, addr, AF_INET, &status);
+		if (status) {
+			as_shutdown(asn);
+			asn = as_setup(as_server);
+			if (asn == NULL) {
+				Fprintf(stderr, "%s: as_setup failed, AS# lookups"
+						" disabled\n", prog);
+				(void)fflush(stderr);
+				as_path = 0;
+				break;
+			}
+			else
+				continue;
+		}
+		Printf(" [AS%u]", as);
+		break;
+	}
 
 	if (nflag)
 		Printf(" %s", addr);
diff --git a/usr.sbin/traceroute6/traceroute6.c b/usr.sbin/traceroute6/traceroute6.c
index 173e97c13bb3..eb6086706f9f 100644
--- a/usr.sbin/traceroute6/traceroute6.c
+++ b/usr.sbin/traceroute6/traceroute6.c
@@ -894,6 +894,8 @@ main(int argc, char *argv[])
 			as_path = 0;
 		}
 	}
+	if (as_path)
+	        signal(SIGPIPE, SIG_IGN);
 
 	/*
 	 * Message to users
@@ -1577,13 +1579,30 @@ void
 print(struct msghdr *mhdr, int cc)
 {
 	struct sockaddr_in6 *from = (struct sockaddr_in6 *)mhdr->msg_name;
+	int as, status;
 	char hbuf[NI_MAXHOST];
 
 	if (cap_getnameinfo(capdns, (struct sockaddr *)from, from->sin6_len,
 	    hbuf, sizeof(hbuf), NULL, 0, NI_NUMERICHOST) != 0)
 		strlcpy(hbuf, "invalid", sizeof(hbuf));
-	if (as_path)
-		printf(" [AS%u]", as_lookup(asn, hbuf, AF_INET6));
+	while (as_path) {
+		as = as_lookup(asn, hbuf, AF_INET6, &status);
+		if (status) {
+			as_shutdown(asn);
+			asn = as_setup(as_server);
+			if (asn == NULL) {
+				fprintf(stderr, "traceroute6: as_setup failed, AS# lookups"
+						" disabled\n");
+				(void)fflush(stderr);
+				as_path = 0;
+				break;
+			}
+			else
+				continue;
+		}
+		printf(" [AS%u]", as);
+		break;
+	}
 	if (nflag)
 		printf(" %s", hbuf);
 	else