Fix output dump on error.

Only dump it when we weren't already emitting it.
Merge remote-tracking branch 'twitter/master'