defend against null or undefined eventStream; add Shane's test
Merge pull request #3324 from jrgm/issue3319dev

defend against null or undefined eventStream; add Shane's test

r+ Thanks again @jrgm, this is great.