diff --git a/xC.c b/xC.c
index 8baf71d..3f64804 100644
--- a/xC.c
+++ b/xC.c
@@ -2910,12 +2910,16 @@ relay_try_fetch_client (struct app_context *ctx, int listen_fd)
 		if (errno == EINTR)
 			return true;
 
+		// TODO: Try to make sure these find their way to the global buffer.
 		if (accept_error_is_transient (errno))
+		{
 			print_warning ("%s: %s", "accept", strerror (errno));
-		else
-			// TODO: Rather dispose of the listening socket.
-			print_fatal ("%s: %s", "accept", strerror (errno));
-		return true;
+			return true;
+		}
+
+		print_error ("%s: %s", "accept", strerror (errno));
+		app_context_relay_stop (ctx);
+		return false;
 	}
 
 	hard_assert (peer_len <= sizeof peer);