[merge-branch] Add error checking on resume.