Add null stream handling