diff --git a/stepmania/src/SongManager.cpp b/stepmania/src/SongManager.cpp
index dd7c141554..568fe4aefc 100644
--- a/stepmania/src/SongManager.cpp
+++ b/stepmania/src/SongManager.cpp
@@ -735,9 +735,12 @@ void SongManager::RevertFromDisk( Song *pSong, bool bAllowNotesLoss )
 
 
 #define CONVERT_STEPS_POINTER( pSteps ) { \
-	StepsID id = mapOldStepsToStepsID[pSteps]; /* this will always succeed */ \
-	pSteps = id.ToSteps( pSong, bAllowNotesLoss ); }
-
+	if( pSteps != NULL ) { \
+		map<Steps*,StepsID>::iterator it = mapOldStepsToStepsID.find(pSteps); \
+		if( it != mapOldStepsToStepsID.end() ) \
+			pSteps = it->second.ToSteps( pSong, bAllowNotesLoss ); \
+	} \
+}
 
 
 	FOREACH_PlayerNumber( p )