diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp
index ba3f1f4dd6..d68e5d8e15 100644
--- a/stepmania/src/GameState.cpp
+++ b/stepmania/src/GameState.cpp
@@ -76,6 +76,9 @@ void GameState::Reset()
 		m_pCurNotes[p] = NULL;
 	m_pCurCourse = NULL;
 
+	SAFE_DELETE( m_pPosition );
+	m_pPosition = new NoteFieldPositioning("Positioning.ini");
+
 	ResetMusicStatistics();
 
 	m_CurStageStats = StageStats();
@@ -112,9 +115,6 @@ void GameState::Reset()
 		m_fSuperMeter[p] = 0;
 		m_fSuperMeterGrowthScale[p] = 1;
 	}
-
-	SAFE_DELETE( m_pPosition );
-	m_pPosition = new NoteFieldPositioning("Positioning.ini");
 }
 
 void GameState::Update( float fDelta )
diff --git a/stepmania/src/PlayerOptions.cpp b/stepmania/src/PlayerOptions.cpp
index fc209e3838..b000f4335f 100644
--- a/stepmania/src/PlayerOptions.cpp
+++ b/stepmania/src/PlayerOptions.cpp
@@ -148,6 +148,8 @@ CString PlayerOptions::GetString()
  * you don't want this. */
 void PlayerOptions::FromString( CString sOptions )
 {
+	ASSERT( GAMESTATE->m_pPosition );
+	ASSERT( NOTESKIN );
 //	Init();
 	sOptions.MakeLower();
 	CStringArray asBits;