diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp
index 70dd7e2d39..f9813e3e6b 100644
--- a/stepmania/src/ScreenOptions.cpp
+++ b/stepmania/src/ScreenOptions.cpp
@@ -77,18 +77,21 @@ void ScreenOptions::Init( InputMode im, OptionRow OptionRows[], int iNumOptionLi
 {
 	LOG->Trace( "ScreenOptions::Set()" );
 
+	CHECKPOINT;
 
 	m_InputMode = im;
 	m_OptionRow = OptionRows;
 	m_iNumOptionRows = iNumOptionLines;
 	m_bLoadExplanations = bLoadExplanations;
 
+	CHECKPOINT;
 
 	this->ImportOptions();
 	for( unsigned l=0; l<MAX_OPTION_LINES; l++ )
 		if( m_OptionRow[l].bOneChoiceForAllPlayers )
 			m_iSelectedOption[PLAYER_2][l] = m_iSelectedOption[PLAYER_1][l];
 
+	CHECKPOINT;
 
 
 	int p;
@@ -103,6 +106,8 @@ void ScreenOptions::Init( InputMode im, OptionRow OptionRows[], int iNumOptionLi
 		m_framePage.AddChild( &m_Highlight[p] );
 	}
 
+	CHECKPOINT;
+
 	// init underlines
 	for( p=0; p<NUM_PLAYERS; p++ )
 	{
@@ -119,6 +124,8 @@ void ScreenOptions::Init( InputMode im, OptionRow OptionRows[], int iNumOptionLi
 		}
 	}
 
+	CHECKPOINT;
+
 	// init m_textItems from optionLines
 	int r;
 	for( r=0; r<m_iNumOptionRows; r++ )		// foreach line
@@ -189,8 +196,10 @@ void ScreenOptions::Init( InputMode im, OptionRow OptionRows[], int iNumOptionLi
 			m_framePage.AddChild( textItems[c] );
 	}
 
+	CHECKPOINT;
 	InitOptionsText();
 
+	CHECKPOINT;
 	// TRICKY:  Add one more item.  This will be "EXIT"
 	{
 		BitmapText *bt = new BitmapText;
@@ -213,6 +222,7 @@ void ScreenOptions::Init( InputMode im, OptionRow OptionRows[], int iNumOptionLi
 	m_textExplanation.SetShadowLength( 0 );
 	m_framePage.AddChild( &m_textExplanation );
 
+	CHECKPOINT;
 
 	PositionItems();
 	PositionUnderlines();
diff --git a/stepmania/src/ScreenOptionsMaster.cpp b/stepmania/src/ScreenOptionsMaster.cpp
index 075a6968ad..59da9f474c 100644
--- a/stepmania/src/ScreenOptionsMaster.cpp
+++ b/stepmania/src/ScreenOptionsMaster.cpp
@@ -273,6 +273,7 @@ ScreenOptionsMaster::ScreenOptionsMaster( CString sClassName ):
 
 	ASSERT( (int) OptionRowHandlers.size() == NumRows );
 
+	CHECKPOINT;
 	Init( im, m_OptionRowAlloc, NumRows, Explanations );
 }
 
@@ -360,6 +361,7 @@ int ScreenOptionsMaster::ImportOption( const OptionRow &row, const OptionRowHand
 
 void ScreenOptionsMaster::ImportOptions()
 {
+	CHECKPOINT;
 	for( unsigned i = 0; i < OptionRowHandlers.size(); ++i )
 	{
 		const OptionRowHandler &hand = OptionRowHandlers[i];