am a92896f6: Merge "Fix a mediaserver crash caused by dereferencing a NULL pointer." into jb-dev

* commit 'a92896f62d8f4a4a6ff61f26439ad61c210ce728':
  Fix a mediaserver crash caused by dereferencing a NULL pointer.