Removing null in nextOrEndOfStream

Instead of a NullPointerException, we now get the friendly asserts.