Fix: Multiple catch blocks sometimes get reordered