am 4df3011e: Protect against destroying uncreated values

* commit '4df3011e2f3680a80ecc89c817ba528b2a578f0f':
  Protect against destroying uncreated values