Don't add empty metadata to received messages
Merge pull request #998 from hurtonm/master

Don't add empty metadata to received messages