Merge "Avoid double-rendering on late exceptions"