diff --git a/ChangeLog b/ChangeLog
index a24813297..407e391d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-09-07	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
+	* src/gui/controller_connection_dialog.cpp:
+	fixed crash when closing controller select dialog and no controller
+	has been selected (closes #2078357)
+
 	* include/track_container.h:
 	* src/core/song.cpp:
 	* src/core/track_container.cpp:
diff --git a/src/gui/controller_connection_dialog.cpp b/src/gui/controller_connection_dialog.cpp
index e2c6e0bcb..b6ad6a101 100644
--- a/src/gui/controller_connection_dialog.cpp
+++ b/src/gui/controller_connection_dialog.cpp
@@ -329,7 +329,7 @@ void controllerConnectionDialog::selectController( void )
 					m_userController->model()->value() );
 		}
 
-		if( m_controller->hasModel( m_targetModel ) )
+		if( m_controller && m_controller->hasModel( m_targetModel ) )
 		{
 			QMessageBox::warning(this, tr("LMMS"), tr("Cycle Detected."));
 			return;