Improve handling of comment messages in client

Change-Id: I3c0191ddcd71df90fb5376005e073ea97c04636c