Change: add some extra error trapping for playback edge cases, still haven't fixed the end of queue issues