diff --git a/stepmania/src/SongManager.cpp b/stepmania/src/SongManager.cpp
index 39d2f7d5b8..a70ce17bd0 100644
--- a/stepmania/src/SongManager.cpp
+++ b/stepmania/src/SongManager.cpp
@@ -1390,7 +1390,8 @@ void SongManager::UpdatePopular()
 		if( apBestSongs[j]->GetDisplayed() != Song::SHOW_ALWAYS )
 			bFiltered = true;
 		/* Filter out locked songs. */
-		if( UNLOCKMAN->SongIsLocked(apBestSongs[j]) )
+		// XXX Hack, this depends on UNLOCKMAN being around.
+		if( UNLOCKMAN && UNLOCKMAN->SongIsLocked(apBestSongs[j]) )
 			bFiltered = true;
 		if( !bFiltered )
 			continue;
diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp
index 84704e8afb..e5e2c3fedc 100644
--- a/stepmania/src/StepMania.cpp
+++ b/stepmania/src/StepMania.cpp
@@ -1060,6 +1060,7 @@ int main(int argc, char* argv[])
 	PROFILEMAN	= new ProfileManager;
 	PROFILEMAN->Init();				// must load after SONGMAN
 	UNLOCKMAN	= new UnlockManager;
+	SONGMAN->UpdatePopular();
 	SONGMAN->UpdatePreferredSort();
 
 	/* This shouldn't need to be here; if it's taking long enough that this is