diff --git a/src/qamqp/amqp.cpp b/src/qamqp/amqp.cpp
index f5db5db..8b51173 100644
--- a/src/qamqp/amqp.cpp
+++ b/src/qamqp/amqp.cpp
@@ -160,7 +160,6 @@ Queue * ClientPrivate::createQueue(int channelNumber, const QString &name )
 void ClientPrivate::disconnect()
 {
 	P_Q(QAMQP::Client);
-	//connection_->close();
 	if(network_->state() != QAbstractSocket::UnconnectedState)
 	{
 		network_->QAMQP::Network::disconnect();	
diff --git a/src/qamqp/amqp_network.cpp b/src/qamqp/amqp_network.cpp
index cc4a62f..4d08927 100644
--- a/src/qamqp/amqp_network.cpp
+++ b/src/qamqp/amqp_network.cpp
@@ -73,16 +73,17 @@ void QAMQP::Network::error( QAbstractSocket::SocketError socketError )
 		case QAbstractSocket::ProxyConnectionClosedError:
 		case QAbstractSocket::ProxyConnectionRefusedError:
 		case QAbstractSocket::ProxyConnectionTimeoutError:
-			if( autoReconnect_ && connect_ )
-			{
-				QTimer::singleShot(timeOut_, this, SLOT(connectTo()));
-			}
-			break;
-
+			
 		default:
 			qWarning() << "AMQP Socket Error: " << socket_->errorString();
 			break;
 	}
+
+	if( autoReconnect_ && connect_ )
+	{
+		QTimer::singleShot(timeOut_, this, SLOT(connectTo()));
+	}
+
 }
 
 void QAMQP::Network::readyRead()