Don't send blank messages to the client

Closes #742