1 files changed, 3 insertions, 1 deletions
diff --git a/subsonic-android/src/github/daneren2005/dsub/service/DownloadServiceImpl.java b/subsonic-android/src/github/daneren2005/dsub/service/DownloadServiceImpl.java
index bf68e905..31a16aac 100644
--- a/subsonic-android/src/github/daneren2005/dsub/service/DownloadServiceImpl.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/DownloadServiceImpl.java
@@ -207,7 +207,9 @@ public class DownloadServiceImpl extends Service implements DownloadService {
 		}
         lifecycleSupport.onDestroy();
         mediaPlayer.release();
-		nextMediaPlayer.release();
+        if(nextMediaPlayer != null) {
+			nextMediaPlayer.release();
+        }
         shufflePlayBuffer.shutdown();
         if (equalizerController != null) {
             equalizerController.release();