diff --git a/src/core/midi/MidiClient.cpp b/src/core/midi/MidiClient.cpp
index 9add4e80bdd..8ba70bcb775 100644
--- a/src/core/midi/MidiClient.cpp
+++ b/src/core/midi/MidiClient.cpp
@@ -67,6 +67,11 @@ void MidiClient::addPort( MidiPort* port )
 
 void MidiClient::removePort( MidiPort* port )
 {
+	if( ! port )
+	{
+		return;
+	}
+
 	QVector<MidiPort *>::Iterator it =
 		qFind( m_midiPorts.begin(), m_midiPorts.end(), port );
 	if( it != m_midiPorts.end() )