diff --git a/CHANGES b/CHANGES
index eeed46df590eb4c2c06b2ba0aa27d4ebb845d27d..46a79d0dd4fac35c9b9ca16363b0a90cfc952752 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
 
 SFLphone (0.4.1-pre2) / now
 	* rearranged utilspp use
+        * Bug fix when trying to use more than 6 lines.
 
 SFLphone (0.4.1-pre1) / 2005-08-11
 	* Use libeXosip2
diff --git a/ChangeLog b/ChangeLog
index 0c1ca314672f716d631f67937cd774f368368fd4..c1435fbd31487c9e881c81eafa40a4bc5a5de09f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-Jean-Philippe Barette-LaPierre (28 April 2005) version 0.4.1-pre1
+Jean-Philippe Barette-LaPierre (29 April 2005) version 0.4.1-pre1
+- Bug fix when trying to use more than 6 lines.
+
+Jean-Philippe Barette-LaPierre (20 August 2005) version 0.4.1-pre1
 - Manager has now a LifetimeLibrary policy.
 - Utilspp has been rearranged.
 	
diff --git a/src/gui/qt/qtGUImainwindow.cpp b/src/gui/qt/qtGUImainwindow.cpp
index 32696aa669e17d0df73de1a8295879e3a50624a6..4e05615a4baa6fe5282516870b5d81fb0dbd9987 100644
--- a/src/gui/qt/qtGUImainwindow.cpp
+++ b/src/gui/qt/qtGUImainwindow.cpp
@@ -1007,9 +1007,14 @@ QtGUIMainWindow::qt_outgoingCall (void)
 	
 	id = outgoingCall(to);
 	if (id > 0) {	
-		line = associateCall2Line(id);
+	        line = associateCall2Line(id);
+		if(line == -1) {
+		  _debug("Call %d -> there's no available lines\n", id);
+		  return -1;
+		}
 		_debug("Call %d -> line %d\n", id, line);
 		
+
 		// To store information about stop scrolling text
 		_lcd->resetForScrolling (false);
 		phLines[line]->setStopScrolling(false);