diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index fe81a000bc..d99a3ef249 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -816,6 +816,8 @@ void ScreenGameplay::Update( float fDeltaTime )
 
 	Screen::Update( fDeltaTime );
 
+	if( GAMESTATE->m_pCurSong == NULL )
+		return;
 
 	if( GAMESTATE->m_MasterPlayerNumber != PLAYER_INVALID )
 		m_MaxCombo.SetText( ssprintf("%d", GAMESTATE->m_CurStageStats.iCurCombo[GAMESTATE->m_MasterPlayerNumber]) ); /* MAKE THIS WORK FOR BOTH PLAYERS! */