am c874dffb: Split multicatch so they have different handlers.

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