Bug 1070932 - Updates error handling code can fail r=marco