remove null return from nextOrEndOfStream.

Currently produces NullPointerException if it fails to get the end of the stream, instead of the handy test assertions.