diff --git a/2.5DHero/2.5DHero/Resources/Sound/MusicManager.vb b/2.5DHero/2.5DHero/Resources/Sound/MusicManager.vb
index 93cecd5b9..88890fc26 100644
--- a/2.5DHero/2.5DHero/Resources/Sound/MusicManager.vb
+++ b/2.5DHero/2.5DHero/Resources/Sound/MusicManager.vb
@@ -467,7 +467,15 @@
     End Function
 
     Public Shared Sub ForceVolumeUpdate()
+    #If WINDOWS Then
+        Try
+            MediaPlayer.Volume = Volume * MasterVolume
+        Catch ex As NullReferenceException
+           ' song changed while changing volume
+        End Try
+    #Else
         MediaPlayer.Volume = Volume * MasterVolume
+    #End If
         LastVolume = Volume * MasterVolume
     End Sub