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