Error Cleanup In IntermediateReader.

Some cleanup in how `IntermediateReader` throws `InvalidContentException`s.