Catch more exceptions