diff -r 0dda3692ec9b -r f31ddc9bfa5f mercurial/commands.py
--- a/mercurial/commands.py	Thu Sep 03 22:25:16 2015 +0800
+++ b/mercurial/commands.py	Fri Sep 25 13:30:49 2015 -0700
@@ -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()