diff --git a/stepmania/src/OptionRow.cpp b/stepmania/src/OptionRow.cpp
index 011cd93fec..92c76ce4b5 100644
--- a/stepmania/src/OptionRow.cpp
+++ b/stepmania/src/OptionRow.cpp
@@ -103,8 +103,11 @@ void OptionRow::Clear()
 	FOREACH_PlayerNumber( p )
 		m_Underline[p].clear();
 
-	FOREACH_CONST( CString, m_pHand->m_vsReloadRowMessages, m )
-		MESSAGEMAN->Unsubscribe( this, *m );
+	if( m_pHand != NULL )
+	{
+		FOREACH_CONST( CString, m_pHand->m_vsReloadRowMessages, m )
+			MESSAGEMAN->Unsubscribe( this, *m );
+	}
 	SAFE_DELETE( m_pHand );
 
 	m_bFirstItemGoesDown = false;