diff --git a/src/client_list.c b/src/client_list.c
index 3550cda..ea50d30 100644
--- a/src/client_list.c
+++ b/src/client_list.c
@@ -76,7 +76,11 @@ int addToList( wrp_msg_t **msg)
             if(rc < 0)
             {
                 ParodusError ("Unable to connect socket (errno=%d, %s)\n",errno, strerror(errno));
-                nn_close (sock);
+		if (nn_close (sock) < 0)
+                {
+                   ParodusError ("nn_close socket=%d (err=%d, %s)\n", 
+			sock, errno, strerror(errno));
+		}
                 
             }
             else
diff --git a/src/upstream.c b/src/upstream.c
index eb2cba2..7b75d9c 100644
--- a/src/upstream.c
+++ b/src/upstream.c
@@ -418,6 +418,7 @@ void *processUpstreamMessage()
 									ParodusError("Failed to get device_id\n");
 								}
 						} else if (WRP_MSG_TYPE__SVC_ALIVE != msgType) {
+						  /* Don't reply to service alive message */
 							sendUpstreamMsgToServer(&message->msg, message->len);
 						}
 					}