diff --git a/MQTTSNGateway/src/MQTTSNGWClientRecvTask.cpp b/MQTTSNGateway/src/MQTTSNGWClientRecvTask.cpp
index f20783d..2019b1a 100644
--- a/MQTTSNGateway/src/MQTTSNGWClientRecvTask.cpp
+++ b/MQTTSNGateway/src/MQTTSNGWClientRecvTask.cpp
@@ -131,7 +131,7 @@ void ClientRecvTask::run()
 				delete packet;
 				/* Send DISCONNECT */
 				SensorNetAddress* addr = new SensorNetAddress();
-				addr = _sensorNetwork->getSenderAddress();
+				addr->setAddress(_sensorNetwork->getSenderAddress()->getIpAddress(), _sensorNetwork->getSenderAddress()->getPortNo());
 				packet = new MQTTSNPacket();
 				packet->setDISCONNECT(0);
 				ev = new Event();
diff --git a/MQTTSNGateway/src/MQTTSNGWPublishHandler.cpp b/MQTTSNGateway/src/MQTTSNGWPublishHandler.cpp
index 6c4bff3..e23bcae 100644
--- a/MQTTSNGateway/src/MQTTSNGWPublishHandler.cpp
+++ b/MQTTSNGateway/src/MQTTSNGWPublishHandler.cpp
@@ -48,7 +48,6 @@ void MQTTSNPublishHandler::handlePublish(Client* client, MQTTSNPacket* packet)
 	if ( !client->isActive() )
 	{
 		/* Reply DISCONNECT to the client */
-		WRITELOG("     The client is not active. status = %s\n",  client->getStatus());
 		Event* ev = new Event();
 		MQTTSNPacket* disconnect = new MQTTSNPacket();
 		disconnect->setDISCONNECT(0);