Catch more exceptions :/