This article presents a fault tolerant extension for the Naimi-Trehel token-based mutual exclusion algorithm. Contrary to the extension proposed by Naimi-Trehel, our approach minimizes the use of broadcast support by exploiting the distributed queue of token requests kept by the original algorithm. It also provides good fairness since, during failure recovery, it tries to preserve the order in which token requests would have been satisfied had the failure not occurred.