Handle more exceptions