Fix for token storage deserialization issue with empty values.