diff --git a/mercurial/shelve.py b/mercurial/shelve.py
--- a/mercurial/shelve.py
+++ b/mercurial/shelve.py
@@ -117,12 +117,7 @@
         return self.vfs.stat(self.fname)
 
     def opener(self, mode=b'rb'):
-        try:
-            return self.vfs(self.fname, mode)
-        except IOError as err:
-            if err.errno != errno.ENOENT:
-                raise
-            raise error.Abort(_(b"shelved change '%s' not found") % self.name)
+        return self.vfs(self.fname, mode)
 
     def applybundle(self, tr):
         fp = self.opener()
diff --git a/tests/test-shelve2.t b/tests/test-shelve2.t
--- a/tests/test-shelve2.t
+++ b/tests/test-shelve2.t
@@ -756,7 +756,7 @@
   junk1           (* ago)     (glob)
   $ hg unshelve
   unshelving change 'junk1'
-  abort: shelved change 'junk1' not found
+  abort: $ENOENT$: '$TESTTMP/corrupt-shelves/.hg/shelved/junk1.hg'
   [255]
   $ hg shelve -d junk1
   $ find .hg/shelve*