Tweaked error reproting and retrying