diff --git a/src/rx/rx.c b/src/rx/rx.c
index 8fe51b673f..abeda0aca9 100644
--- a/src/rx/rx.c
+++ b/src/rx/rx.c
@@ -2237,9 +2237,8 @@ rx_GetCall(int tno, struct rx_service *cur_service, osi_socket * socketp)
 	    service = tcall->conn->service;
 	    if (QuotaOK(service)) {
 		MUTEX_ENTER(&rx_pthread_mutex);
-		/* XXX - If tcall->entry.next is NULL, then we're no longer
-		 * on a queue at all. This shouldn't happen. */
-		if (tno == rxi_fcfs_thread_num || !tcall->entry.next) {
+		if (tno == rxi_fcfs_thread_num
+			|| opr_queue_IsEnd(&rx_incomingCallQueue, cursor)) {
 		    MUTEX_EXIT(&rx_pthread_mutex);
 		    /* If we're the fcfs thread, then  we'll just use
 		     * this call. If we haven't been able to find an optimal