diff --git a/src/connector.c b/src/connector.c
index f3b689bf..a18ba2e7 100644
--- a/src/connector.c
+++ b/src/connector.c
@@ -93,9 +93,11 @@ static void invalidate_client(client_instance_t *client)
 
 static void parse_client_msg(conn_instance_t *ci, client_instance_t *client)
 {
+	ckpool_t *ckp = ci->pi->ckp;
 	char msg[PAGESIZE], *eol;
 	int buflen, ret;
 	bool moredata;
+	json_t *val;
 
 retry:
 	buflen = PAGESIZE - client->bufofs;
@@ -141,7 +143,19 @@ reparse:
 	msg[buflen] = 0;
 	client->bufofs -= buflen;
 	memmove(client->buf, client->buf + buflen, client->bufofs);
-	LOGWARNING("Client fd %d sent message %s", client->fd, msg);
+	val = json_loads(msg, 0, NULL);
+	if (!val)
+		LOGWARNING("Client fd %d sent invalid json message %s", client->fd, msg);
+	else {
+		char *s;
+
+		json_object_set_new_nocheck(val, "client_id", json_integer(client->id));
+		s = json_dumps(val, 0);
+		send_proc(&ckp->stratifier, s);
+		free(s);
+		json_decref(val);
+	}
+
 	if (client->bufofs)
 		goto reparse;
 }
diff --git a/src/stratifier.c b/src/stratifier.c
index a91e592c..1664961c 100644
--- a/src/stratifier.c
+++ b/src/stratifier.c
@@ -298,9 +298,12 @@ retry:
 	LOGDEBUG("Stratifier received request: %s", buf);
 	if (!strncasecmp(buf, "shutdown", 8))
 		goto out;
-	if (!strncasecmp(buf, "update", 6)) {
+	else if (!strncasecmp(buf, "update", 6)) {
 		update_base(ckp);
 		goto reset;
+	} else {
+		LOGDEBUG("Received unrecognised message: %s", buf);
+		goto retry;
 	}
 
 out: