am 9e0f1fde: Fix some bugs when no music is present.

Merge commit '9e0f1fde0956ee7f5b76b77df7aea9b936e2c3a9' into eclair-mr2

* commit '9e0f1fde0956ee7f5b76b77df7aea9b936e2c3a9':
  Fix some bugs when no music is present.