Handle some video playback error edge cases a bit better