am 151f74fc: am 4df3011e: Protect against destroying uncreated values

* commit '151f74fca138df5d3c6f83b86e3b6e8d9748a7e3':
  Protect against destroying uncreated values