diff --git a/stepmania/src/HoldJudgment.cpp b/stepmania/src/HoldJudgment.cpp
index 1f2f08f4bd..5cde1a05ec 100644
--- a/stepmania/src/HoldJudgment.cpp
+++ b/stepmania/src/HoldJudgment.cpp
@@ -79,9 +79,11 @@ void HoldJudgment::LoadFromMultiPlayer( MultiPlayer mp )
 
 void HoldJudgment::HandleMessage( const Message &msg )
 {
-	ASSERT( m_mpToTrack != MultiPlayer_Invalid );
 	if( msg == enum_add2(Message_ShowHoldJudgmentMuliPlayerP1,m_mpToTrack) )
+	{
+		ASSERT( m_mpToTrack != MultiPlayer_Invalid );
 		SetHoldJudgment( STATSMAN->m_CurStageStats.m_multiPlayer[m_mpToTrack].m_hnsLast );
+	}
 
 	ActorFrame::HandleMessage( msg );
 }
diff --git a/stepmania/src/ScreenSelect.cpp b/stepmania/src/ScreenSelect.cpp
index 05af20afdc..0141c69d90 100644
--- a/stepmania/src/ScreenSelect.cpp
+++ b/stepmania/src/ScreenSelect.cpp
@@ -248,7 +248,8 @@ void ScreenSelect::HandleScreenMessage( const ScreenMessage SM )
 
 void ScreenSelect::HandleMessage( const Message &msg )
 {
-	this->UpdateSelectableChoices();
+	if( find(m_asSubscribedMessages.begin(), m_asSubscribedMessages.end(), msg.GetName()) != m_asSubscribedMessages.end() )
+		this->UpdateSelectableChoices();
 
 	ScreenWithMenuElements::HandleMessage( msg );
 }