Ensure that NPE is not thrown if no availability ends.
Merge branch 'mbst-7051-radioplayer-https-upload' into stage