Merge branch 'trac4002' Save error string before use

Save the error string before using it to minimize the possibility of
it changing between when it gets generated and reviewed and when it
gets logged.