Catch more exceptions to avoid surfacing