diff --git a/src/afs/afs_conn.c b/src/afs/afs_conn.c
index 2a1aeee35e..8cd8a75c83 100644
--- a/src/afs/afs_conn.c
+++ b/src/afs/afs_conn.c
@@ -453,6 +453,18 @@ afs_ConnBySA(struct srvAddr *sap, unsigned short aport, afs_int32 acell,
         return NULL;
     }
 
+    if (tc->refCount > 10000) {
+	static int warned;
+	if (!warned) {
+	    warned = 1;
+	    afs_warn("afs: Very high afs_conn refCount detected (conn %p, count %d)\n",
+	             tc, (int)tc->refCount);
+	    afs_warn("afs: Trying to continue, but this may indicate an issue\n");
+	    afs_warn("afs: that may eventually crash the machine. Please file\n");
+	    afs_warn("afs: a bug report.\n");
+	}
+    }
+
     if (tu->states & UTokensBad) {
 	/* we may still have an authenticated RPC connection here,
 	 * we'll have to create a new, unauthenticated, connection.