diff --git a/MQTTSNGateway/src/MQTTSNGWClientRecvTask.cpp b/MQTTSNGateway/src/MQTTSNGWClientRecvTask.cpp
index 8bc6e17..35feac0 100644
--- a/MQTTSNGateway/src/MQTTSNGWClientRecvTask.cpp
+++ b/MQTTSNGateway/src/MQTTSNGWClientRecvTask.cpp
@@ -178,14 +178,14 @@ void ClientRecvTask::run()
 
 				client = clientList->getClient(&data.clientID);
 
-				if ( fwd )
+				if ( fwd != nullptr )
 				{
 				    if ( client == nullptr )
 				    {
 				        /* create a new client */
 				        client = clientList->createClient(0, &data.clientID, clientType);
 				    }
-				    /* Add to af forwarded client list of forwarder. */
+				    /* Add to a forwarded client list of forwarder. */
                     fwd->addClient(client, &nodeId);
 				}
 				else
diff --git a/MQTTSNGateway/src/MQTTSNGWForwarder.cpp b/MQTTSNGateway/src/MQTTSNGWForwarder.cpp
index 9cba49e..71b2e83 100644
--- a/MQTTSNGateway/src/MQTTSNGWForwarder.cpp
+++ b/MQTTSNGateway/src/MQTTSNGWForwarder.cpp
@@ -143,6 +143,7 @@ void Forwarder::addClient(Client* client, WirelessNodeId* id)
             if ( p->_client == client )
             {
                 client->setForwarder(this);
+                p->setWirelessNodeId(id);
                 return;
             }
             prev = p;