am 0218970a: Merge "Fix error overwriting when restoring error"

* commit '0218970afaeefcabf7ed4b476cb93f28d61847b8':
  Fix error overwriting when restoring error