Removing null in nextOrEndOfStream on env flop

Instead of a NullPointerException, we now get the friendly asserts

adding colinrgodsey to copyright waiver