Merge markrian's handle-no-playable-sources feature branch.