Merge "Fix error overwriting when restoring error"