diff --git a/stepmania/src/ThemeManager.cpp b/stepmania/src/ThemeManager.cpp
index e62ef4ef12..cf5c745546 100644
--- a/stepmania/src/ThemeManager.cpp
+++ b/stepmania/src/ThemeManager.cpp
@@ -457,9 +457,8 @@ CString ThemeManager::GetPathToAndFallback( const CString &sThemeName, ElementCa
 
 		// search fallback name (if any)
 		CString sFallback;
-		GetMetricRawRecursive( sClassName, "Fallback", sFallback );
-		if( sFallback.empty() )
-			return NULL;
+		if( !GetMetricRawRecursive(sClassName, "Fallback", sFallback) )
+			return CString();
 		sClassName = sFallback;
 	}