diff --git a/stepmania/src/Style.cpp b/stepmania/src/Style.cpp
index d65e6a1dab..e10dcc0d95 100644
--- a/stepmania/src/Style.cpp
+++ b/stepmania/src/Style.cpp
@@ -60,6 +60,9 @@ StyleInput Style::GameInputToStyleInput( const GameInput &GameI ) const
 {
 	StyleInput SI;
 
+	if( m_iInputColumn[GameI.controller][GameI.button] == NO_MAPPING )
+		return SI; // Return invalid.
+
 	for( int i = 0; i <= GameI.button; ++i )
 		if( m_iInputColumn[GameI.controller][i] == END_MAPPING )
 			return SI;	// Return invalid.