diff --git a/src/org/kreed/vanilla/PlaybackService.java b/src/org/kreed/vanilla/PlaybackService.java
index 4ca69b50..eb5fc96e 100644
--- a/src/org/kreed/vanilla/PlaybackService.java
+++ b/src/org/kreed/vanilla/PlaybackService.java
@@ -302,8 +302,10 @@ public class PlaybackService extends Service implements Runnable, MediaPlayer.On
 			mScrobble = mSettings.getBoolean("scrobble", false);
 		} else if ("volume".equals(key)) {
 			float volume = mSettings.getFloat("volume", 1.0f);
-			synchronized (mMediaPlayer) {
-				mMediaPlayer.setVolume(volume, volume);
+			if (mMediaPlayer != null) {
+				synchronized (mMediaPlayer) {
+					mMediaPlayer.setVolume(volume, volume);
+				}
 			}
 		}
 	}