Add better handling for end-of-file errors

[alistairjevans]

Effectively we won't report them, because it causes a lot of confusion when writing tests.