diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp
index 06ab3123fa..6ad278cda3 100644
--- a/stepmania/src/MusicWheel.cpp
+++ b/stepmania/src/MusicWheel.cpp
@@ -1655,10 +1655,13 @@ Song *MusicWheel::GetPreferredSelectionForRandomOrPortal()
 
 		FOREACH( Difficulty, vDifficultiesToRequire, d )
 			if( !pSong->HasStepsTypeAndDifficulty(st,*d) )
-				continue;
+				goto try_next;
 		return wid[iSelection].m_pSong;
+try_next:
+		;
 	}
-	FAIL_M( "Couldn't find any songs" );
+	LOG->Warn( "Couldn't find any songs" );
+	return wid[0].m_pSong;
 }
 
 /*