adding error handle when streamtype is null
conflict merge
git merget mistake fix