diff --git a/ChangeLog b/ChangeLog
index e50cb7c1c..54fb74e49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-05	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
+
+	* src/tracks/instrument_track.cpp:
+	integrated patch from Jean-Yves Lefort <jylefort/at/freebsd/dot/org>
+
 2006-12-04	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
 	* Makefile.am:
diff --git a/src/tracks/instrument_track.cpp b/src/tracks/instrument_track.cpp
index 6a54be35a..ff02271fe 100644
--- a/src/tracks/instrument_track.cpp
+++ b/src/tracks/instrument_track.cpp
@@ -919,7 +919,7 @@ bool FASTCALL instrumentTrack::play( const midiTime & _start,
 		trackContentObject * tco = getTCO( _tco_num );
 		tcos.push_back( tco );
 		bb_track = bbTrack::findBBTrack( _tco_num, eng() );
-		if( !( bb_track->automationDisabled( this )
+		if( bb_track != NULL && !( bb_track->automationDisabled( this )
 				|| dynamic_cast<pattern *>( tco )->empty() ) )
 		{
 			sendMidiTime( _start );