diff --git a/stepmania/src/DancingCharacters.cpp b/stepmania/src/DancingCharacters.cpp
index f8b94603cb..fa63aa43e5 100644
--- a/stepmania/src/DancingCharacters.cpp
+++ b/stepmania/src/DancingCharacters.cpp
@@ -74,7 +74,11 @@ DancingCharacters::DancingCharacters()
 	m_fCameraHeightEnd = CAMERA_REST_LOOK_AT_HEIGHT;
 	m_fLookAtHeight = CAMERA_REST_LOOK_AT_HEIGHT;
 	m_fThisCameraStartBeat = 0;
-	m_fThisCameraEndBeat = GAMESTATE->m_pCurSong->m_fFirstBeat;
+	m_fThisCameraEndBeat = 0;
+	/* XXX: This is being initialized before m_pCurSong is set by ScreenGameplay
+	 * in course mode.  Init in first update? */
+	if( GAMESTATE->m_pCurSong )
+		m_fThisCameraEndBeat = GAMESTATE->m_pCurSong->m_fFirstBeat;
 
 }