you need to do the null and stream check here too