Add guard around the call to generate save value.