diff --git a/stepmania/src/ScreenSelect.cpp b/stepmania/src/ScreenSelect.cpp
index 2c6ec7e6e4..5a2bb17876 100644
--- a/stepmania/src/ScreenSelect.cpp
+++ b/stepmania/src/ScreenSelect.cpp
@@ -202,7 +202,8 @@ void ScreenSelect::HandleScreenMessage( const ScreenMessage SM )
 		{
 			const GameCommand &gc = m_aGameCommands[iMastersIndex];
 			m_sNextScreen = gc.m_sScreen;
-			gc.ApplyToAllPlayers();
+			if( !gc.m_bInvalid )
+				gc.ApplyToAllPlayers();
 		}
 		else
 		{
@@ -211,7 +212,8 @@ void ScreenSelect::HandleScreenMessage( const ScreenMessage SM )
 				int iIndex = this->GetSelectionIndex(p);
 				const GameCommand &gc = m_aGameCommands[iIndex];
 				m_sNextScreen = gc.m_sScreen;
-				gc.Apply( p );
+				if( !gc.m_bInvalid )
+					gc.Apply( p );
 			}
 		}
 
diff --git a/stepmania/src/UnlockManager.cpp b/stepmania/src/UnlockManager.cpp
index 6e32a4c938..f18718a355 100644
--- a/stepmania/src/UnlockManager.cpp
+++ b/stepmania/src/UnlockManager.cpp
@@ -528,6 +528,7 @@ void UnlockManager::Reload()
 float UnlockManager::PointsUntilNextUnlock( UnlockRequirement t ) const
 {
 	float fScores[NUM_UnlockRequirement];
+	ZERO( fScores );
 	UNLOCKMAN->GetPoints( PROFILEMAN->GetMachineProfile(), fScores );
 
 	float fSmallestPoints = FLT_MAX;   // or an arbitrarily large value