diff --git a/MQTTSNGateway/src/MQTTSNGWAdapterManager.cpp b/MQTTSNGateway/src/MQTTSNGWAdapterManager.cpp
index 512be6d..25c3754 100644
--- a/MQTTSNGateway/src/MQTTSNGWAdapterManager.cpp
+++ b/MQTTSNGateway/src/MQTTSNGWAdapterManager.cpp
@@ -127,8 +127,8 @@ int AdapterManager::unicastToClient(Client* client, MQTTSNPacket* packet, Client
 		MQTTSNGWEncapsulatedPacket encap(packet);
 		WirelessNodeId* wnId = fwd->getWirelessNodeId(client);
 		encap.setWirelessNodeId(wnId);
-		WRITELOG(FORMAT_Y_W_G, currentDateTime(), encap.getName(), RIGHTARROW, fwd->getId(), encap.print(pbuf));
 		task->log(client, packet);
+		WRITELOG(FORMAT_Y_W_G, currentDateTime(), encap.getName(), RIGHTARROW, fwd->getId(), encap.print(pbuf));
 		rc = encap.unicast(_gateway->getSensorNetwork(),fwd->getSensorNetAddr());
 	}
 	else
diff --git a/MQTTSNGateway/src/MQTTSNGWClientRecvTask.cpp b/MQTTSNGateway/src/MQTTSNGWClientRecvTask.cpp
index 5957cae..6e1ea6a 100644
--- a/MQTTSNGateway/src/MQTTSNGWClientRecvTask.cpp
+++ b/MQTTSNGateway/src/MQTTSNGWClientRecvTask.cpp
@@ -145,10 +145,12 @@ void ClientRecvTask::run()
 					}
 				}
 			}
+			else
+			{
+				client = _gateway->getClientList()->getClient(senderAddr);
+			}
 		}
 
-		client = _gateway->getClientList()->getClient(senderAddr);
-
 		if ( client )
 		{
 			/* write log and post Event */
@@ -217,11 +219,11 @@ void ClientRecvTask::run()
 				log(client, packet, 0);
 				if ( packet->getType() == MQTTSN_ENCAPSULATED )
 				{
-					WRITELOG("%s Forwarder(%s) is not declared by ClientList file. message has been discarded.%s\n", ERRMSG_HEADER, _sensorNetwork->getSenderAddress()->sprint(buf), ERRMSG_FOOTER);
+					WRITELOG("%s MQTTSNGWClientRecvTask  Forwarder(%s) is not declared by ClientList file. message has been discarded.%s\n", ERRMSG_HEADER, _sensorNetwork->getSenderAddress()->sprint(buf), ERRMSG_FOOTER);
 				}
 				else
 				{
-					WRITELOG("%s Client(%s) is not connecting. message has been discarded.%s\n", ERRMSG_HEADER, senderAddr->sprint(buf), ERRMSG_FOOTER);
+					WRITELOG("%s MQTTSNGWClientRecvTask  Client(%s) is not connecting. message has been discarded.%s\n", ERRMSG_HEADER, senderAddr->sprint(buf), ERRMSG_FOOTER);
 				}
 				delete packet;
 			}