diff --git a/stepmania/src/Trail.cpp b/stepmania/src/Trail.cpp
index 0b454e9229..a651c73d25 100644
--- a/stepmania/src/Trail.cpp
+++ b/stepmania/src/Trail.cpp
@@ -152,15 +152,12 @@ void Trail::GetDisplayBpms( DisplayBpms &AddTo ) const
 		{
 		case Song::DISPLAY_ACTUAL:
 		case Song::DISPLAY_SPECIFIED:
-			{
-				pSong->GetDisplayBpms( AddTo );
-			}
+			pSong->GetDisplayBpms( AddTo );
 			break;
 		case Song::DISPLAY_RANDOM:
 			AddTo.Add( -1 );
 			break;
-		default:
-			ASSERT(0);
+		DEFAULT_FAIL( pSong->m_DisplayBPMType );
 		}
 	}
 }