readded null check in streamproxy