Merge change 6132 into donut

* changes:
  If we can't get the restore set's metadata, don't continue