--- a/mercurial/dispatch.py	Fri Sep 25 12:38:20 2015 +0800
+++ b/mercurial/dispatch.py	Fri Sep 25 11:16:20 2015 -0400
@@ -253,7 +253,7 @@
             # check if the command is in a disabled extension
             # (but don't check for extensions themselves)
             commands.help_(ui, inst.args[0], unknowncmd=True)
-        except error.UnknownCommand:
+        except (error.UnknownCommand, util.Abort):
             suggested = False
             if len(inst.args) == 2:
                 sim = _getsimilar(inst.args[1], inst.args[0])