Fix NPE
Merge branch '5.0.0' of github.com:UniversalMediaServer/UniversalMediaServer into 5.0.0