diff --git a/ChangeLog b/ChangeLog
index 8860a8be4..51a9f17d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-10-18	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
+	* src/gui/widgets/track_label_button.cpp:
+	more checks before accessing icon - fixes crash when using ZynAddSubFX
+	plugin
+
 	* plugins/vst_base/remote_vst_plugin.cpp:
 	various tweakings
 
diff --git a/src/gui/widgets/track_label_button.cpp b/src/gui/widgets/track_label_button.cpp
index dda74b8b3..1d0e585a8 100644
--- a/src/gui/widgets/track_label_button.cpp
+++ b/src/gui/widgets/track_label_button.cpp
@@ -126,7 +126,9 @@ void trackLabelButton::paintEvent( QPaintEvent * _pe )
 			dynamic_cast<instrumentTrack *>(
 						m_trackView->getTrack() );
 		const pixmapLoader * pl;
-		if( it && ( pl = it->getInstrument()->getDescriptor()->logo ) )
+		if( it && it->getInstrument() &&
+			it->getInstrument()->getDescriptor() &&
+			( pl = it->getInstrument()->getDescriptor()->logo ) )
 		{
 			if( pl->pixmapName() != m_iconName )
 			{