Cover more exceptions instead of just dying.