Catching more exceptions so the update thread doesn't die