Catch more exceptions to avoid not returning to the caller