Fix #769 : take in account the fact that the Value name can be null.