A non-volatile memory (NVM) system has a main NVM sector with multiple memory segments, a redundant NVM sector for storing recovery records, an address-matching circuit having multiple memory sections, each adapted to store a pair of main and substitute addresses, and an NVM controller. The NVM controller is configured to determine if a first memory segment of the main NVM sector is no longer usable and, consequently (i) create a recovery record for storage in the redundant NVM sector that includes the address of the first memory segment and the data associated with the first memory segment, and (ii) add a pair of main and substitute addresses to the address-matching circuit, where the main address is the address of the first memory segment and the substitute address identifies a substitute location for the data associated with the first memory segment.