Improved error diagnostics.
Merge branch 'bug-14866-MakeFileReaderAndFileWriterMicroserviceBased-2014-03'