This makes the catch-all catch less. 

If this is actually the right direction, it would be good to also add a test. towards #1100.