diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
index 34bc019a0..1c58a64f8 100644
--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@@ -386,12 +386,8 @@ static void logMessage(int pri, char *msg)
 		v->iov_base = msg;
 		v->iov_len = strlen(msg);
 	  writev_retry:
-		if (-1 == writev(remotefd, iov, IOV_COUNT)) {
-			if (errno == EINTR) {
-				goto writev_retry;
-			}
-			error_msg_and_die("cannot write to remote file handle on %s:%d",
-							  RemoteHost, RemotePort);
+		if ((-1 == writev(remotefd, iov, IOV_COUNT)) && (errno == EINTR)) {
+			goto writev_retry;
 		}
 	}
 	if (local_logging == TRUE)