--- a/hotspot/src/share/vm/opto/output.cpp	Tue Aug 15 14:03:52 2017 +0000
+++ b/hotspot/src/share/vm/opto/output.cpp	Tue Aug 15 17:18:00 2017 +0000
@@ -1636,6 +1636,7 @@
       }
 
       // Set the offset of the return from the call
+      assert(handler_bcis.find(-1) != -1, "must have default handler");
       _handler_table.add_subtable(call_return, &handler_bcis, NULL, &handler_pcos);
       continue;
     }