am 789178a6: Split multicatch so they have different handlers.

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