Fix for messages with missing body