diff --git a/plugins/vst_effect/VstEffect.cpp b/plugins/vst_effect/VstEffect.cpp
index 2ada8ca14..a6286d38e 100644
--- a/plugins/vst_effect/VstEffect.cpp
+++ b/plugins/vst_effect/VstEffect.cpp
@@ -162,6 +162,10 @@ void VstEffect::openPlugin( const QString & _plugin )
 void VstEffect::closePlugin()
 {
 	m_pluginMutex.lock();
+	if( m_plugin->pluginWidget() != NULL )
+	{
+		delete m_plugin->pluginWidget();
+	}
 	delete m_plugin;
 	m_plugin = NULL;
 	m_pluginMutex.unlock();
diff --git a/plugins/vst_effect/VstEffectControlDialog.cpp b/plugins/vst_effect/VstEffectControlDialog.cpp
index bb012b93b..ce598fade 100644
--- a/plugins/vst_effect/VstEffectControlDialog.cpp
+++ b/plugins/vst_effect/VstEffectControlDialog.cpp
@@ -226,7 +226,7 @@ void VstEffectControlDialog::paintEvent( QPaintEvent * )
 
 VstEffectControlDialog::~VstEffectControlDialog()
 {
-	delete m_pluginWidget;
+	//delete m_pluginWidget;
 }
 
 
diff --git a/src/gui/widgets/pixmap_button.cpp b/src/gui/widgets/pixmap_button.cpp
index 0320b4932..795915da5 100644
--- a/src/gui/widgets/pixmap_button.cpp
+++ b/src/gui/widgets/pixmap_button.cpp
@@ -57,7 +57,7 @@ void pixmapButton::paintEvent( QPaintEvent * )
 {
 	QPainter p( this );
 
-	if( model()->value() || m_pressed )
+	if( model() != NULL && model()->value() || m_pressed )
 	{
 		if( !m_activePixmap.isNull() )
 		{