Handle a few more exceptions