diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index a9c6ffaa6f..89a54bae72 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,4 +1,5 @@
 March 9, 2008 (Changes by Graf Zahl)
+- fixed: StreamSong::SetPosition required a NULL pointer check.
 - fixed: The release build still linked to the old FMOD version.
 - fixed: SPCSong only works for Win32 so its definition must be excluded for Linux.
 
diff --git a/src/sound/music_stream.cpp b/src/sound/music_stream.cpp
index bddbfaf844..12fc8e60a6 100644
--- a/src/sound/music_stream.cpp
+++ b/src/sound/music_stream.cpp
@@ -83,5 +83,12 @@ bool StreamSong::IsPlaying ()
 
 bool StreamSong::SetPosition(int order)
 {
-	return m_Stream->SetPosition(order);
+	if (m_Stream != NULL)
+	{
+		return m_Stream->SetPosition(order);
+	}
+	else
+	{
+		return false;
+	}
 }