Can now handle null in streams