Merge "Exception rendering fixes"