diff --git a/src/s_playlist.cpp b/src/s_playlist.cpp
index 1ab294dc1f..e92a5ceea5 100644
--- a/src/s_playlist.cpp
+++ b/src/s_playlist.cpp
@@ -198,7 +198,7 @@ int FPlayList::Advance ()
 
 int FPlayList::Backup ()
 {
-	if (--Position < 0)
+	if (Position-- == 0)
 	{
 		Position = Songs.Size() - 1;
 	}
diff --git a/src/sound/i_music.cpp b/src/sound/i_music.cpp
index 83c75410d5..38e820c8be 100644
--- a/src/sound/i_music.cpp
+++ b/src/sound/i_music.cpp
@@ -112,7 +112,10 @@ CUSTOM_CVAR (Float, snd_musicvolume, 0.5f, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
 	else
 	{
 		// Set general music volume.
-		GSnd->SetMusicVolume(clamp<float>(self * relative_volume, 0, 1));
+		if (GSnd != NULL)
+		{
+			GSnd->SetMusicVolume(clamp<float>(self * relative_volume, 0, 1));
+		}
 		// For music not implemented through the digital sound system,
 		// let them know about the change.
 		if (currSong != NULL)