Merge change 24607 into eclair

* changes:
  Try not to crash the system server because of corrupt restore data