Fix round-tripping of template fetch error message

This fixes a good chunk of the blacklist diffs in 115965. The bug fixed here
does not affect production, as template fetching is enabled there.

Change-Id: I691ee25013684763529d2d9c69b69c835c3384f2