diff --git a/mercurial/commands.py b/mercurial/commands.py
index 0dda3692ec9b6b9e220ad7afa1434b553f8f62c0_bWVyY3VyaWFsL2NvbW1hbmRzLnB5..f31ddc9bfa5f8f28cd899e907a0a9edb072b3e9a_bWVyY3VyaWFsL2NvbW1hbmRzLnB5 100644
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -6372,6 +6372,12 @@
                 try:
                     op = bundle2.processbundle(repo, gen, lambda: tr)
                     tr.close()
+                except error.UnsupportedPartError as exc:
+                    raise util.Abort(_('%s: unknown bundle feature, %s')
+                                     % (fname, exc),
+                                     hint=_("see https://mercurial.selenic.com/"
+                                            "wiki/BundleFeature for more "
+                                            "information"))
                 finally:
                     if tr:
                         tr.release()