am b984a072: Merge "Add more error checking to xml restore" into lmp-preview-dev

* commit 'b984a072a7addc2404ea9ae2f67ccfa85e686167':
  Add more error checking to xml restore