diff --git a/src/NotesLoaderBMS.cpp b/src/NotesLoaderBMS.cpp
index 492e647680..5b9dc1ed19 100644
--- a/src/NotesLoaderBMS.cpp
+++ b/src/NotesLoaderBMS.cpp
@@ -923,7 +923,14 @@ void BMSChartReader::CalculateStepsType()
 {
 	nonEmptyTracksCount = nonEmptyTracks.size();
 	out->m_StepsType = DetermineStepsType();
-	out->m_StepsTypeStr = GAMEMAN->GetStepsTypeInfo(out->m_StepsType).szName;
+	if(out->m_StepsType == StepsType_Invalid)
+	{
+		out->m_StepsTypeStr = "BMS_loaded_invalid_stepstype";
+	}
+	else
+	{
+		out->m_StepsTypeStr = GAMEMAN->GetStepsTypeInfo(out->m_StepsType).szName;
+	}
 }
 
 enum BmsRawChannel
@@ -1766,4 +1773,4 @@ bool BMSLoader::LoadFromDir( const RString &sDir, Song &out )
  * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
  * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
- */
\ No newline at end of file
+ */
diff --git a/src/ScreenOptionsMasterPrefs.cpp b/src/ScreenOptionsMasterPrefs.cpp
index 115d6b45da..2e6783fac1 100644
--- a/src/ScreenOptionsMasterPrefs.cpp
+++ b/src/ScreenOptionsMasterPrefs.cpp
@@ -726,7 +726,6 @@ static void InitializeConfOptions()
 	ADD( ConfOption( "ShowInstructions",		MovePref<bool>,		"Skip","Show") );
 	ADD( ConfOption( "ShowCaution",			MovePref<bool>,		"Skip","Show") );
 	ADD( ConfOption( "DancePointsForOni",		MovePref<bool>,		"Percent","Dance Points") );
-	ADD( ConfOption( "ShowSelectGroup",		MovePref<bool>,		"All Music","Choose") );
 	ADD( ConfOption( "MusicWheelUsesSections",	MovePref<MusicWheelUsesSections>, "Never","Always","Title Only") );
 	ADD( ConfOption( "CourseSortOrder",		MovePref<CourseSortOrders>, "Num Songs","Average Feet","Total Feet","Ranking") );
 	ADD( ConfOption( "MoveRandomToEnd",		MovePref<bool>,		"No","Yes") );