diff --git a/src/core/FxMixer.cpp b/src/core/FxMixer.cpp
index e28deda3b..43a254660 100644
--- a/src/core/FxMixer.cpp
+++ b/src/core/FxMixer.cpp
@@ -102,6 +102,8 @@ int FxMixer::createChannel()
 
 void FxMixer::deleteChannel(int index)
 {
+	m_fxChannels[index]->m_lock.lock();
+
 	// go through every instrument and adjust for the channel index change
 	QVector<track *> songTrackList = engine::getSong()->tracks();
 	QVector<track *> bbTrackList = engine::getBBTrackContainer()->tracks();
@@ -165,6 +167,7 @@ void FxMixer::deleteChannel(int index)
 	}
 
 	// actually delete the channel
+	delete m_fxChannels[index];
 	m_fxChannels.remove(index);
 }
 
diff --git a/src/gui/widgets/knob.cpp b/src/gui/widgets/knob.cpp
index 31a772c1b..72a57c735 100644
--- a/src/gui/widgets/knob.cpp
+++ b/src/gui/widgets/knob.cpp
@@ -492,7 +492,11 @@ void knob::mouseMoveEvent( QMouseEvent * _me )
 
 void knob::mouseReleaseEvent( QMouseEvent * /* _me*/ )
 {
-	model()->addJournalEntryFromOldToCurVal();
+	AutomatableModel * thisModel = model();
+	if( thisModel )
+	{
+		thisModel->addJournalEntryFromOldToCurVal();
+	}
 
 	m_buttonPressed = false;