Small fix - added a todo to handle the case when there is no message received from the server.