diff --git a/appl/telnet/telnetd/utility.c b/appl/telnet/telnetd/utility.c
index b064352c9..23aebd1bb 100644
--- a/appl/telnet/telnetd/utility.c
+++ b/appl/telnet/telnetd/utility.c
@@ -68,7 +68,7 @@ ttloop(void)
 	syslog(LOG_INFO, "ttloop:  read: %m\n");
 	exit(1);
     } else if (ncc == 0) {
-	syslog(LOG_INFO, "ttloop:  peer died: %m\n");
+	syslog(LOG_INFO, "ttloop:  peer died\n");
 	exit(1);
     }
     DIAG(TD_REPORT, {
@@ -93,6 +93,9 @@ stilloob(int s)
     fd_set	excepts;
     int value;
 
+    if (s >= FD_SETSIZE)
+	fatal(ourpty, "fd too large");
+
     do {
 	FD_ZERO(&excepts);
 	FD_SET(s, &excepts);