am 3e5c62bc: am c874dffb: Split multicatch so they have different handlers.

* commit '3e5c62bcd37b78aa2af228a5e0b5725ccc297200':
  Split multicatch so they have different handlers.