Fixed support for empty messages.