diff --git a/stepmania/src/NoteData.cpp b/stepmania/src/NoteData.cpp
index c49fdb7b26..ce1208a176 100644
--- a/stepmania/src/NoteData.cpp
+++ b/stepmania/src/NoteData.cpp
@@ -987,7 +987,8 @@ NoteData::_all_tracks_iterator<ND, iter, TN>::_all_tracks_iterator( ND &nd, int
 		if( m_bReverse )
 		{
 			cur = end;
-			cur--;
+			if( cur != begin )
+				cur--;
 		}
 		else
 		{