diff --git a/quakespasm/Quake/bgmusic.c b/quakespasm/Quake/bgmusic.c
index 4b333a10..6a01fec4 100644
--- a/quakespasm/Quake/bgmusic.c
+++ b/quakespasm/Quake/bgmusic.c
@@ -128,7 +128,7 @@ qboolean BGM_Init (void)
 	Cmd_AddCommand("music_loop", BGM_Loop_f);
 	Cmd_AddCommand("music_stop", BGM_Stop_f);
 
-	if (COM_CheckParm("-nomusic") != 0)
+	if (COM_CheckParm("-noextmusic") != 0)
 		no_extmusic = true;
 
 	bgmloop = true;
@@ -302,6 +302,8 @@ void BGM_PlayCDtrack (byte track, qboolean looping)
 	{
 		if (! handler->is_available)
 			goto _next;
+		if (! CDRIPTYPE(handler->type))
+			goto _next;
 		q_snprintf(tmp, sizeof(tmp), "%s/track%02d%s",
 				MUSIC_DIRNAME, (int)track, handler->ext);
 		if (! COM_FileExists(tmp, &path_id))
diff --git a/quakespasm/README.html b/quakespasm/README.html
index 60bd06db..9fb2b7b5 100644
--- a/quakespasm/README.html
+++ b/quakespasm/README.html
@@ -90,7 +90,7 @@ It includes 64bit CPU cupport, a new sound driver, several networking fixes, and
 <UL>
 <LI>Tracks should be named like "track02.ogg", "track03.ogg" ... (there is no track01) and placed into "Quake/id1/music".</LI>
 <LI>Unix users may need some extra libraries installed: libmad for MP3 and libogg and libvorbis for OGG.</LI>
-<LI>Use the "-nomusic" option to disable this feature.</LI>
+<LI>Use the "-noextmusic" option to disable this feature.</LI>
 </UL>
 </P>
 
diff --git a/quakespasm/README.sgml b/quakespasm/README.sgml
index cf87465f..477bbe4e 100644
--- a/quakespasm/README.sgml
+++ b/quakespasm/README.sgml
@@ -48,7 +48,7 @@ Since version 0.85.4, Quakespasm can play back external MP3, OGG and Wave music
 <itemize>
 <item>Tracks should be named like "track02.ogg", "track03.ogg" ... (there is no track01) and placed into "Quake/id1/music".
 <item>Unix users may need some extra libraries installed: libmad for MP3 and libogg and libvorbis for OGG.
-<item>Use the "-nomusic" option to disable this feature.
+<item>Use the "-noextmusic" option to disable this feature.
 </itemize>
 
 
diff --git a/quakespasm/README.txt b/quakespasm/README.txt
index fa570070..0c2ec98b 100644
--- a/quakespasm/README.txt
+++ b/quakespasm/README.txt
@@ -86,7 +86,7 @@
   o  Unix users may need some extra libraries installed: libmad for MP3
      and libogg and libvorbis for OGG.
 
-  o  Use the "-nomusic" option to disable this feature.
+  o  Use the "-noextmusic" option to disable this feature.
 
 
   4.  Compiling