changes to match yuriy's changes with streamurl on errors