Handle a couple of uncaught errors.  This should be backported
1 file changed