diff --git a/ChangeLog b/ChangeLog
index a6f892883..9d7929c24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,10 @@
 	- shift drag on an unselected note didn't work (FIXED)
 	- added a note detuning tool
 	- fixed mouse cursor glitch when mousing over notes
+	
+	* src/tracks/instrument_track.cpp:
+	fixed crash in processAudioBuffer when notePlayHandle was NULL
+	(crashed certain instruments like sf2)
 
 2008-12-14	Andrew Kelley	<superjoe30/at/gmail/dot/com>
 
diff --git a/src/tracks/instrument_track.cpp b/src/tracks/instrument_track.cpp
index 42d400e1f..451a653f2 100644
--- a/src/tracks/instrument_track.cpp
+++ b/src/tracks/instrument_track.cpp
@@ -180,7 +180,8 @@ void instrumentTrack::processAudioBuffer( sampleFrame * _buf,
 								_frames,
 			( _n != NULL ) ? _n->offset() : 0,
 			panningToVolumeVector( 
-						(int) m_panningModel.value() + _n->getPanning(),
+						(int) m_panningModel.value() +
+								  ( _n != NULL ) ? _n->getPanning() : 0,
 						v_scale ),
 							 &m_audioPort );
 }