diff --git a/stepmania/src/SongManager.cpp b/stepmania/src/SongManager.cpp
index 3173566302..6c41fa9655 100644
--- a/stepmania/src/SongManager.cpp
+++ b/stepmania/src/SongManager.cpp
@@ -833,7 +833,15 @@ bool CompareNotesPointersForExtra(const Notes *n1, const Notes *n2)
 void SongManager::GetExtraStageInfo( bool bExtra2, CString sPreferredGroup, const StyleDef *sd, 
 								   Song*& pSongOut, Notes*& pNotesOut, PlayerOptions& po_out, SongOptions& so_out )
 {
-	if(GetExtraStageInfoFromCourse(bExtra2, (GAMESTATE->m_sPreferredGroup == GROUP_ALL_MUSIC ? GAMESTATE->m_pCurSong->m_sGroupName : GAMESTATE->m_sPreferredGroup), pSongOut, pNotesOut, po_out, so_out))
+	CString Group = GAMESTATE->m_sPreferredGroup;
+	if(Group == GROUP_ALL_MUSIC)
+	{
+		ASSERT(GAMESTATE->m_pCurSong);
+		Group = GAMESTATE->m_pCurSong->m_sGroupName;
+	}
+	ASSERT(Group != "");
+
+	if(GetExtraStageInfoFromCourse(bExtra2, Group, pSongOut, pNotesOut, po_out, so_out))
 		return;
 	
 	// Choose a hard song for the extra stage