--- a/hgext/shelve.py	Thu Feb 04 03:47:00 2016 +0000
+++ b/hgext/shelve.py	Thu Feb 04 03:47:38 2016 +0000
@@ -628,7 +628,7 @@
         except IOError as err:
             if err.errno != errno.ENOENT:
                 raise
-            raise error.Abort(_('no unshelve operation underway'))
+            cmdutil.wrongtooltocontinue(repo, _('unshelve'))
 
         if abortf:
             return unshelveabort(ui, repo, state, opts)