diff --git a/src/gui/official/PhoneLineManagerImpl.cpp b/src/gui/official/PhoneLineManagerImpl.cpp
index 9eb287e2e76b2e36824a576c88f6e664ae9f92f6..ef6c67e31bef43f0f8085af22f54696aa1bbd6df 100644
--- a/src/gui/official/PhoneLineManagerImpl.cpp
+++ b/src/gui/official/PhoneLineManagerImpl.cpp
@@ -196,10 +196,12 @@ PhoneLineManagerImpl::sendKey(Qt::Key c)
 
   PhoneLine *selectedLine = getCurrentLine();
 
-  if(!selectedLine) {
+  // Only digits that select a line if there's
+  // no current line.
+  if (!selectedLine && QChar(c).isDigit()) {
     selectedLine = selectNextAvailableLine();
   }
-
+  
   if(selectedLine) {
     PhoneLineLocker guard(selectedLine);
     selectedLine->sendKey(c);
diff --git a/src/gui/official/TCPSessionIO.cpp b/src/gui/official/TCPSessionIO.cpp
index 22d9a4c497e8dbb6057e4e3f5fe4ac7fd267f04f..33b3419564a13199204bdc6301eaf58d1131af22 100644
--- a/src/gui/official/TCPSessionIO.cpp
+++ b/src/gui/official/TCPSessionIO.cpp
@@ -45,9 +45,8 @@ TCPSessionIO::~TCPSessionIO()
 void 
 TCPSessionIO::error()
 {
-  _debug("TCPSessionIO: %s. %d\n", 
-	 mSocket->errorString().toStdString().c_str(),
-	 mSocket->state());
+  _debug("TCPSessionIO: %s. \n", 
+	 mSocket->errorString().toStdString().c_str());
   mSocket->close();
 }