diff --git a/stepmania/src/ScreenUnlock.cpp b/stepmania/src/ScreenUnlock.cpp
index aace437e25..5cb9ff28a1 100644
--- a/stepmania/src/ScreenUnlock.cpp
+++ b/stepmania/src/ScreenUnlock.cpp
@@ -139,7 +139,7 @@ ScreenUnlock::ScreenUnlock() : ScreenAttract("ScreenUnlock")
 				}
 			}
 
-			if (pSong != NULL)
+			if (pSong != NULL && pSong->m_pSong != NULL)
 			{
 				if( pSong->isLocked)
 				{
diff --git a/stepmania/src/UnlockSystem.cpp b/stepmania/src/UnlockSystem.cpp
index 2c0fdef1b6..bdf6f3674d 100644
--- a/stepmania/src/UnlockSystem.cpp
+++ b/stepmania/src/UnlockSystem.cpp
@@ -273,6 +273,11 @@ bool UnlockSystem::LoadFromDATFile( CString sPath )
 		LOG->Trace( "                CS %f", m_SongEntries[i].m_fStagesCleared );
 		LOG->Trace( "                RO %i", m_SongEntries[i].m_iRouletteSeed );
 		LOG->Trace( "            Status %slocked", tmp.c_str() );
+		if (m_SongEntries[i].m_pSong)
+			LOG->Trace( "                   Found matching song entry" );
+		if (m_SongEntries[i].m_pCourse)
+			LOG->Trace( "                   Found matching course entry" );
+
 		
 	}