Fix/null stream

pull req for peer review, let me know if this seems like a good way to do it :)