defend against null or undefined eventStream; add Shane's test

Fixes #3319